[file-roller: 102/123] removed _g_strcmp_null_tolerant

[Paolo Bacchilega <paobac src gnome org>]

commit 731b00c94161188fed3d4d53ba45e79d23a395df
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Thu Aug 2 08:39:03 2012 +0200

    removed _g_strcmp_null_tolerant
    
    GLib provides g_strcmp0 already

 src/glib-utils.c |   17 +++++------------
 src/glib-utils.h |    2 +-
 2 files changed, 6 insertions(+), 13 deletions(-)
---
diff --git a/src/glib-utils.c b/src/glib-utils.c
index 7505917..304d80b 100644
--- a/src/glib-utils.c
+++ b/src/glib-utils.c
@@ -119,18 +119,11 @@ _g_str_substitute (const char *str,
 }
 
 
-int
-_g_strcmp_null_tolerant (const char *s1,
-			 const char *s2)
-{
-	if ((s1 == NULL) && (s2 == NULL))
-		return 0;
-	else if ((s1 != NULL) && (s2 == NULL))
-		return 1;
-	else if ((s1 == NULL) && (s2 != NULL))
-		return -1;
-	else
-		return strcmp (s1, s2);
+gboolean
+_g_str_equal (const char *s1,
+	      const char *s2)
+{
+	return g_strcmp0 (s1, s2) == 0;
 }
 
 
@@ -827,7 +820,7 @@ int
 _g_uri_cmp (const char *uri1,
 	    const char *uri2)
 {
-	return _g_strcmp_null_tolerant (uri1, uri2);
+	return g_strcmp0 (uri1, uri2);
 }
 
 
diff --git a/src/glib-utils.h b/src/glib-utils.h
index a2044b8..8fd3c0b 100644
--- a/src/glib-utils.h
+++ b/src/glib-utils.h
@@ -61,7 +61,7 @@ gboolean            _g_strchrs                     (const char          *str,
 char *              _g_str_substitute              (const char          *str,
 						    const char          *from_str,
 						    const char          *to_str);
-int                 _g_strcmp_null_tolerant        (const char          *s1,
+gboolean            _g_str_equal                   (const char          *s1,
 						    const char          *s2);
 char*               _g_str_escape_full             (const char          *str,
 						    const char          *meta_chars,