Fixed a few -Wall warnings

diff --git a/libglabels/db.c b/libglabels/db.c
index 0e7cf2765b0e9ea96e8cee3d907c0a1b322e403a..bbc32096638128c5e469454850270969f43181bb 100644 (file)
--- a/libglabels/db.c
+++ b/libglabels/db.c
@@ -2183,7 +2183,7 @@ copy_old_custom_files (void)
 
                 if (dir)
                 {
-                        while (name = g_dir_read_name (dir))
+                        while ((name = g_dir_read_name (dir)) != NULL)
                         {
                                 old_full_name = g_build_filename (old_dir_name, name, NULL);
                                 new_full_name = g_build_filename (new_dir_name, name, NULL);

diff --git a/src/file-util.c b/src/file-util.c
index 684c7faa3d10963c85aa56b80dc4ba5d07b3b68e..ace188bdf1380aaa96a70c0bf55ca49885046643 100644 (file)
--- a/src/file-util.c
+++ b/src/file-util.c
@@ -37,7 +37,7 @@ gl_file_util_add_extension (const gchar *orig_filename)
        if (extension == NULL) {
                new_filename = g_strconcat (orig_filename, ".glabels", NULL);
        } else {
-               if (g_strcasecmp (extension, ".glabels") != 0) {
+               if (g_ascii_strcasecmp (extension, ".glabels") != 0) {
                        new_filename =
                            g_strconcat (orig_filename, ".glabels", NULL);
                } else {
@@ -61,7 +61,7 @@ gl_file_util_remove_extension (const gchar *orig_filename)
 
        extension = strrchr (new_filename, '.');
        if (extension != NULL) {
-               if (g_strcasecmp (extension, ".glabels") == 0) {
+               if (g_ascii_strcasecmp (extension, ".glabels") == 0) {
                        *extension = 0; /* truncate string, rm extension */
                }
        }

diff --git a/src/merge.c b/src/merge.c
index 6829246241ef2697c948316ed77a6fb49d09208c..210aac93b4c1220930a8d320abbf274ba594467a 100644 (file)
--- a/src/merge.c
+++ b/src/merge.c
@@ -287,7 +287,7 @@ gl_merge_new (gchar *name)
        for (p=backends; p!=NULL; p=p->next) {
                backend = (Backend *)p->data;
 
-               if (g_strcasecmp(name, backend->name) == 0) {
+               if (g_ascii_strcasecmp(name, backend->name) == 0) {
 
                        merge = GL_MERGE (g_object_newv (backend->type,
                                                         backend->n_params,
@@ -301,7 +301,7 @@ gl_merge_new (gchar *name)
                }
        }
 
-       if ( (merge == NULL) && (g_strcasecmp (name, "None") != 0)) {
+       if ( (merge == NULL) && (g_ascii_strcasecmp (name, "None") != 0)) {
                g_message ("Unknown merge backend \"%s\"", name);
        }
 

diff --git a/src/str-util.c b/src/str-util.c
index 6aa2dd1f3e521493f316139fff967757079e7722..f8c6d70a1355c2e42b23a254d0c874299a303439 100644 (file)
--- a/src/str-util.c
+++ b/src/str-util.c
@@ -49,11 +49,11 @@ PangoAlignment
 gl_str_util_string_to_align (const gchar *string)
 {
 
-       if (g_strcasecmp (string, "Left") == 0) {
+       if (g_ascii_strcasecmp (string, "Left") == 0) {
                return PANGO_ALIGN_LEFT;
-       } else if (g_strcasecmp (string, "Center") == 0) {
+       } else if (g_ascii_strcasecmp (string, "Center") == 0) {
                return PANGO_ALIGN_CENTER;
-       } else if (g_strcasecmp (string, "Right") == 0) {
+       } else if (g_ascii_strcasecmp (string, "Right") == 0) {
                return PANGO_ALIGN_RIGHT;
        } else {
                return PANGO_ALIGN_LEFT;
@@ -83,9 +83,9 @@ PangoWeight
 gl_str_util_string_to_weight (const gchar *string)
 {
 
-       if (g_strcasecmp (string, "Regular") == 0) {
+       if (g_ascii_strcasecmp (string, "Regular") == 0) {
                return PANGO_WEIGHT_NORMAL;
-       } else if (g_strcasecmp (string, "Bold") == 0) {
+       } else if (g_ascii_strcasecmp (string, "Bold") == 0) {
                return PANGO_WEIGHT_BOLD;
        } else {
                return PANGO_WEIGHT_NORMAL;