AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Use g_strcmp0() instead custom safe_strcmp()

Browse Source 
Reported by Rafal Luzynski in
https://bugzilla.gnome.org/show_bug.cgi?id=606415
This commit is contained in:
Javier Jardón 2010-01-08 17:42:34 +01:00 committed by Tristan Van Berkom
parent e9d18c8e07
commit b3e06e8302
2 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gtk/gtkprinter.c
View File

@ -92,18 +92,6 @@ static void gtk_printer_get_property (GObject *object,
G_DEFINE_TYPE (GtkPrinter, gtk_printer, G_TYPE_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 static void
gtk_printer_class_init (GtkPrinterClass *class) gtk_printer_class_init (GtkPrinterClass *class)
{ {
@ -468,7 +456,7 @@ gtk_printer_set_description (GtkPrinter *printer,
priv = printer->priv; priv = printer->priv;
if (safe_strcmp (priv->description, description) == 0) if (g_strcmp0 (priv->description, description) == 0)
return FALSE; return FALSE;
g_free (priv->description); g_free (priv->description);
@ -506,7 +494,7 @@ gtk_printer_set_state_message (GtkPrinter *printer,
priv = printer->priv; priv = printer->priv;
if (safe_strcmp (priv->state_message, message) == 0) if (g_strcmp0 (priv->state_message, message) == 0)
return FALSE; return FALSE;
g_free (priv->state_message); g_free (priv->state_message);
@ -544,7 +532,7 @@ gtk_printer_set_location (GtkPrinter *printer,
priv = printer->priv; priv = printer->priv;
if (safe_strcmp (priv->location, location) == 0) if (g_strcmp0 (priv->location, location) == 0)
return FALSE; return FALSE;
g_free (priv->location); g_free (priv->location);

13
gtk/gtkprinteroptionset.c
View File

@ -144,17 +144,6 @@ gtk_printer_option_set_clear_conflicts (GtkPrinterOptionSet *set)
NULL); 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: * 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); 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)); list = g_list_prepend (list, g_strdup (option->group));
} }