Changeset 11088

Timestamp:

Aug 1, 2010, 7:13:34 PM (12 years ago)

Author:

charles

Message:

(trunk gtk) replace tr_strcmp() with gtr_strcmp0(), a porability wrapper around g_strcmp0()

Location:

trunk/gtk

Files:

• tr-core.c (modified) (4 diffs)
• util.c (modified) (1 diff)
• util.h (modified) (1 diff)

trunk/gtk/tr-core.c

@@ -543 +543 @@
 }
 
-static int
-tr_strcmp( const void * a,
-           const void * b )
-{
-    if( a && b ) return strcmp( a, b );
-    if( a ) return 1;
-    if( b ) return -1;
-    return 0;
-}
-
 static char *
 torrentTrackerString( tr_torrent * tor )
@@ -719 +709 @@
     struct TrCorePrivate * p = TR_CORE( core )->priv;
 
-    if( p->monitor && ( !isEnabled || tr_strcmp( filename, p->monitor_path ) ) )
+    if( p->monitor && ( !isEnabled || gtr_strcmp0( filename, p->monitor_path ) ) )
     {
         g_signal_handler_disconnect( p->monitor, p->monitor_tag );
@@ -1340 +1330 @@
         || ( newFinished != oldFinished )
         || ( newPriority != oldPriority )
-        || tr_strcmp( oldTrackers, newTrackers )
+        || gtr_strcmp0( oldTrackers, newTrackers )
         || gtr_compare_double( newUpSpeed, oldUpSpeed, 3 )
         || gtr_compare_double( newDownSpeed, oldDownSpeed, 3 ) )
@@ -1535 +1525 @@
     const char * oldval = pref_string_get( key );
 
-    if( tr_strcmp( oldval, newval ) )
+    if( gtr_strcmp0( oldval, newval ) )
     {
         pref_string_set( key, newval );

trunk/gtk/util.c

@@ -479 +479 @@
 #endif
     return object;
+}
+
+int
+gtr_strcmp0( const char * str1, const char * str2 )
+{
+#if GLIB_CHECK_VERSION( 2, 16, 0 )
+    return g_strcmp0( str1, str2 );
+#else
+    if( str1 && str2 ) return strcmp( str1, str2 );
+    if( str1 ) return 1;
+    if( str2 ) return -1;
+    return 0;
+#endif
 }
 

trunk/gtk/util.h

@@ -159 +159 @@
 gpointer gtr_object_ref_sink( gpointer object );
 
+/* backwards-comparible wrapper around g_strcmp0() */
+int gtr_strcmp0( const char * str1, const char * str2 );
+
 /***
 ****