aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@helixcode.com>2000-12-05 04:19:12 +0800
committerJeffrey Stedfast <fejj@src.gnome.org>2000-12-05 04:19:12 +0800
commit79737076b89ff4a7018927bdc5516535516ed769 (patch)
treefe6604c80a515911600c05379d97e0fd68709699
parent8a4239fc9ea2642b3f0ffdec4339248d4a615d2a (diff)
downloadgsoc2013-evolution-79737076b89ff4a7018927bdc5516535516ed769.tar.gz
gsoc2013-evolution-79737076b89ff4a7018927bdc5516535516ed769.tar.zst
gsoc2013-evolution-79737076b89ff4a7018927bdc5516535516ed769.zip
macro that calls e_filename_make_safe
2000-12-04 Jeffrey Stedfast <fejj@helixcode.com> * gal/util/e-util.h (e_str_make_safe): macro that calls e_filename_make_safe * gal/util/e-util.c (e_filename_make_safe): Renamed from e_str_make_safe (e_strstrcase): go back to returning gchar * rather than const. svn path=/trunk/; revision=6780
-rw-r--r--e-util/e-util.c10
-rw-r--r--e-util/e-util.h7
2 files changed, 9 insertions, 8 deletions
diff --git a/e-util/e-util.c b/e-util/e-util.c
index 6965bff9ee..9cc1b40b0a 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;
}
-const gchar *
+gchar *
e_strstrcase (const gchar *haystack, const gchar *needle)
{
/* find the needle in the haystack neglecting case */
@@ -515,17 +515,17 @@ e_strstrcase (const gchar *haystack, const gchar *needle)
return NULL;
if (len == 0)
- return haystack;
+ return (gchar *) haystack;
- for (ptr = haystack; *(ptr + len - 1) != '\0'; ptr++)
- if (!g_strncasecmp(ptr, needle, len))
+ for (ptr = (gchar *) haystack; *(ptr + len - 1) != '\0'; ptr++)
+ if (!g_strncasecmp (ptr, needle, len))
return ptr;
return NULL;
}
void
-e_str_make_safe (gchar *string)
+e_filename_make_safe (gchar *string)
{
gchar *p;
diff --git a/e-util/e-util.h b/e-util/e-util.h
index 37dcf3daec..fc6d12ef34 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -48,10 +48,11 @@ gchar **e_strsplit (const gchar *string,
const gchar *delimiter,
gint max_tokens);
-const gchar *e_strstrcase (const gchar *haystack,
- const gchar *needle);
+gchar *e_strstrcase (const gchar *haystack,
+ const gchar *needle);
-void e_str_make_safe (gchar *string);
+void e_filename_make_safe (gchar *string);
+#define e_str_make_safe(x) e_filename_make_safe(x)
void e_marshal_INT__INT_INT_POINTER (GtkObject * object,
GtkSignalFunc func,