callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a warning by making e_strstrcase return a const gchar.

Browse Source 
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
This commit is contained in:
Christopher James Lahey
2000-12-12 02:47:58 +00:00
committed by Chris Lahey
parent ea469b6fc7
commit f0761e8f6c
2 changed files with 58 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e-util/e-util.c
View File

@ -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;

106
e-util/e-util.h
View File

@ -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);
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);
char *e_strdup_strip (char *string);
void e_free_object_list (GList *list);
void e_free_string_list (GList *list);
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);
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);
int e_mkdir_hier (const char *path,
mode_t mode);
gchar **e_strsplit (const gchar *string,
const gchar *delimiter,
gint max_tokens);
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);
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_ */