Fixed a few compiler warnings (bug #473880)

svn path=/trunk/; revision=8616

diff --git a/ChangeLog b/ChangeLog
index c576960..bb034f0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-04-04  Suman Manjunath  <msuman@novell.com>
+
+       * libedataserver/e-data-server-util.c: (e_util_utf8_strstrcase),
+       (e_util_utf8_strstrcasedecomp): 
+       Fixed a few compiler warnings (bug #473880)
+
 2008-04-01  Matthew Barnes  <mbarnes@redhat.com>
 
        * configure.in: Version bump for 2.23.1.

diff --git a/libedataserver/e-data-server-util.c b/libedataserver/e-data-server-util.c
index ceeeccc..662f2f8 100644 (file)
--- a/libedataserver/e-data-server-util.c
+++ b/libedataserver/e-data-server-util.c
@@ -115,8 +115,7 @@ e_util_unicode_get_utf8 (const gchar *text, gunichar *out)
 const gchar *
 e_util_utf8_strstrcase (const gchar *haystack, const gchar *needle)
 {
-        gunichar *nuni;
-        gunichar unival;
+        gunichar *nuni, unival;
         gint nlen;
         const gchar *o, *p;
 
@@ -136,7 +135,7 @@ e_util_utf8_strstrcase (const gchar *haystack, const gchar *needle)
 
        o = haystack;
         for (p = e_util_unicode_get_utf8 (o, &unival); p && unival; p = e_util_unicode_get_utf8 (p, &unival)) {
-                gint sc;
+                gunichar sc;
                 sc = g_unichar_tolower (unival);
                 /* We have valid stripped char */
                 if (sc == nuni[0]) {
@@ -221,7 +220,7 @@ e_util_utf8_strstrcasedecomp (const gchar *haystack, const gchar *needle)
 
         nlen = 0;
         for (p = e_util_unicode_get_utf8 (needle, &unival); p && unival; p = e_util_unicode_get_utf8 (p, &unival)) {
-                gint sc;
+                gunichar sc;
                 sc = stripped_char (unival);
                 if (sc) {
                        nuni[nlen++] = sc;
@@ -234,7 +233,7 @@ e_util_utf8_strstrcasedecomp (const gchar *haystack, const gchar *needle)
 
         o = haystack;
         for (p = e_util_unicode_get_utf8 (o, &unival); p && unival; p = e_util_unicode_get_utf8 (p, &unival)) {
-                gint sc;
+                gunichar sc;
                 sc = stripped_char (unival);
                 if (sc) {
                         /* We have valid stripped char */