aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher James Lahey <clahey@helixcode.com>2000-12-12 10:47:58 +0800
committerChris Lahey <clahey@src.gnome.org>2000-12-12 10:47:58 +0800
commitf0761e8f6c2e32be24bef8b8e3fcce8343656b6a (patch)
tree7105e5a358907ae43650cc834eb983f69908b7d5
parentea469b6fc7fa5a173149a5c0d2725fb3d0aa48b2 (diff)
downloadgsoc2013-evolution-f0761e8f6c2e32be24bef8b8e3fcce8343656b6a.tar
gsoc2013-evolution-f0761e8f6c2e32be24bef8b8e3fcce8343656b6a.tar.gz
gsoc2013-evolution-f0761e8f6c2e32be24bef8b8e3fcce8343656b6a.tar.bz2
gsoc2013-evolution-f0761e8f6c2e32be24bef8b8e3fcce8343656b6a.tar.lz
gsoc2013-evolution-f0761e8f6c2e32be24bef8b8e3fcce8343656b6a.tar.xz
gsoc2013-evolution-f0761e8f6c2e32be24bef8b8e3fcce8343656b6a.tar.zst
gsoc2013-evolution-f0761e8f6c2e32be24bef8b8e3fcce8343656b6a.zip
Fixed a warning by making e_strstrcase return a const gchar.
2000-12-11 Christopher James Lahey <clahey@helixcode.com> * gal/util/e-util.c, gal/util/e-util.h: Fixed a warning by making e_strstrcase return a const gchar. svn path=/trunk/; revision=6936
-rw-r--r--e-util/e-util.c6
-rw-r--r--e-util/e-util.h118
2 files changed, 64 insertions, 60 deletions
diff --git a/e-util/e-util.c b/e-util/e-util.c
index ede1b3c8ab..e24903bc71 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -500,7 +500,7 @@ e_strsplit (const gchar *string,
return str_array;
}
-gchar *
+const gchar *
e_strstrcase (const gchar *haystack, const gchar *needle)
{
/* find the needle in the haystack neglecting case */
@@ -515,9 +515,9 @@ e_strstrcase (const gchar *haystack, const gchar *needle)
return NULL;
if (len == 0)
- return (gchar *) haystack;
+ return haystack;
- for (ptr = (gchar *) haystack; *(ptr + len - 1) != '\0'; ptr++)
+ for (ptr = haystack; *(ptr + len - 1) != '\0'; ptr++)
if (!g_strncasecmp (ptr, needle, len))
return ptr;
diff --git a/e-util/e-util.h b/e-util/e-util.h
index a8a09703d0..5bff2d64b4 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -31,70 +31,74 @@ typedef enum {
E_FOCUS_START,
E_FOCUS_END
} EFocus;
-
-int g_str_compare (const void *x, const void *y);
-int g_int_compare (const void *x, const void *y);
-
-char *e_strdup_strip (char *string);
-
-void e_free_object_list (GList *list);
-void e_free_string_list (GList *list);
-
-char *e_read_file (const char *filename);
-int e_write_file (const char *filename, const char *data, int flags);
-int e_mkdir_hier (const char *path, mode_t mode);
-
-gchar **e_strsplit (const gchar *string,
- const gchar *delimiter,
- gint max_tokens);
-
-gchar *e_strstrcase (const gchar *haystack,
- const gchar *needle);
-
-void e_filename_make_safe (gchar *string);
-
-void e_marshal_INT__INT_INT_POINTER (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data, GtkArg * args);
-
-void e_marshal_NONE__OBJECT_DOUBLE_DOUBLE_BOOL (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data, GtkArg * args);
-
-void e_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOL (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data, GtkArg * args);
-
-void e_marshal_BOOL__OBJECT_DOUBLE_DOUBLE_BOOL (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data, GtkArg * args);
+int g_str_compare (const void *x,
+ const void *y);
+int g_int_compare (const void *x,
+ const void *y);
+
+char *e_strdup_strip (char *string);
+
+void e_free_object_list (GList *list);
+void e_free_string_list (GList *list);
+
+char *e_read_file (const char *filename);
+int e_write_file (const char *filename,
+ const char *data,
+ int flags);
+
+int e_mkdir_hier (const char *path,
+ mode_t mode);
+
+gchar **e_strsplit (const gchar *string,
+ const gchar *delimiter,
+ gint max_tokens);
+
+const gchar *e_strstrcase (const gchar *haystack,
+ const gchar *needle);
+void e_filename_make_safe (gchar *string);
+void e_marshal_INT__INT_INT_POINTER (GtkObject *object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg *args);
+void e_marshal_NONE__OBJECT_DOUBLE_DOUBLE_BOOL (GtkObject *object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg *args);
+void e_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOL (GtkObject *object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg *args);
+void e_marshal_BOOL__OBJECT_DOUBLE_DOUBLE_BOOL (GtkObject *object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg *args);
#define e_marshal_NONE__INT_INT_POINTER_POINTER_UINT_UINT e_marshal_NONE__INT_INT_POINTER_POINTER_INT_INT
-void e_marshal_NONE__INT_INT_POINTER_POINTER_INT_INT (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
+void e_marshal_NONE__INT_INT_POINTER_POINTER_INT_INT (GtkObject *object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg *args);
#define e_marshal_NONE__INT_INT_POINTER_UINT e_marshal_NONE__INT_INT_POINTER_INT
-void e_marshal_NONE__INT_INT_POINTER_INT (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data, GtkArg * args);
+void e_marshal_NONE__INT_INT_POINTER_INT (GtkObject *object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg *args);
#define e_marshal_BOOL__INT_INT_POINTER_INT_INT_UINT e_marshal_BOOL__INT_INT_POINTER_INT_INT_INT
-void e_marshal_BOOL__INT_INT_POINTER_INT_INT_INT (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
+void e_marshal_BOOL__INT_INT_POINTER_INT_INT_INT (GtkObject *object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg *args);
#define e_marshal_NONE__INT_INT_POINTER_INT_INT_POINTER_UINT_UINT e_marshal_NONE__INT_INT_POINTER_INT_INT_POINTER_INT_INT
-void e_marshal_NONE__INT_INT_POINTER_INT_INT_POINTER_INT_INT (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-
-void e_marshal_NONE__POINTER_POINTER_INT (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
+void e_marshal_NONE__INT_INT_POINTER_INT_INT_POINTER_INT_INT (GtkObject *object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg *args);
+void e_marshal_NONE__POINTER_POINTER_INT (GtkObject *object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg *args);
#endif /* _E_UTIL_H_ */