Use g_strcmp0() instead custom safe_strcmp()

Reported by Rafal Luzynski in
https://bugzilla.gnome.org/show_bug.cgi?id=606415

diff --git a/gtk/gtkprinter.c b/gtk/gtkprinter.c
index 9ef7dc892da65e33bb526df96fe4e5be42549f99..1ffaaf5bcb48230fffa8fdd7bc88b72730d9916c 100644 (file)
--- a/gtk/gtkprinter.c
+++ b/gtk/gtkprinter.c
@@ -92,18 +92,6 @@ static void gtk_printer_get_property (GObject      *object,
 
 G_DEFINE_TYPE (GtkPrinter, gtk_printer, G_TYPE_OBJECT)
 
-static int
-safe_strcmp (const char *a, const char *b)
-{
-  if (a == b)
-    return 0;
-  if (a == NULL)
-    return -1;
-  if (b == NULL)
-    return 1;
-  return strcmp (a, b);
-}
-
 static void
 gtk_printer_class_init (GtkPrinterClass *class)
 {
@@ -468,7 +456,7 @@ gtk_printer_set_description (GtkPrinter  *printer,
 
   priv = printer->priv;
 
-  if (safe_strcmp (priv->description, description) == 0)
+  if (g_strcmp0 (priv->description, description) == 0)
     return FALSE;
 
   g_free (priv->description);
@@ -506,7 +494,7 @@ gtk_printer_set_state_message (GtkPrinter  *printer,
 
   priv = printer->priv;
 
-  if (safe_strcmp (priv->state_message, message) == 0)
+  if (g_strcmp0 (priv->state_message, message) == 0)
     return FALSE;
 
   g_free (priv->state_message);
@@ -544,7 +532,7 @@ gtk_printer_set_location (GtkPrinter  *printer,
 
   priv = printer->priv;
 
-  if (safe_strcmp (priv->location, location) == 0)
+  if (g_strcmp0 (priv->location, location) == 0)
     return FALSE;
 
   g_free (priv->location);

diff --git a/gtk/gtkprinteroptionset.c b/gtk/gtkprinteroptionset.c
index 391e5a65488d3ea28bb6cb7b021b61819732f873..dde9d5b6202ee5adc930685bb2eb748b21cc56be 100644 (file)
--- a/gtk/gtkprinteroptionset.c
+++ b/gtk/gtkprinteroptionset.c
@@ -144,17 +144,6 @@ gtk_printer_option_set_clear_conflicts (GtkPrinterOptionSet *set)
                                  NULL);
 }
 
-static int
-safe_strcmp (const char *a, const char *b)
-{
-  if (a == NULL)
-    a = "";
-  if (b == NULL)
-    b = "";
-
-  return strcmp (a, b);
-}
-
 /**
  * gtk_printer_option_set_get_groups:
  *
@@ -171,7 +160,7 @@ gtk_printer_option_set_get_groups (GtkPrinterOptionSet *set)
     {
       option = g_ptr_array_index (set->array, i);
 
-      if (g_list_find_custom (list, option->group, (GCompareFunc)safe_strcmp) == NULL)
+      if (g_list_find_custom (list, option->group, (GCompareFunc)g_strcmp0) == NULL)
        list = g_list_prepend (list, g_strdup (option->group));
     }