Changeset 12209

Timestamp:

Mar 22, 2011, 11:42:25 PM (12 years ago)

Author:

jordan

Message:

(trunk libT) tr_set_compare() is only used in one place, so make it a private function there instead of leaving it public in utils.h

Location:

trunk/libtransmission

Files:

• peer-msgs.c (modified) (1 diff)
• utils.c (modified) (1 diff)
• utils.h (modified) (1 diff)

trunk/libtransmission/peer-msgs.c

@@ -2105 +2105 @@
     diffs->elements[diffs->elementCount++] = *pex;
 }
+
+/**
+ * @brief find the differences and commonalities in two sorted sets
+ * @param a the first set
+ * @param aCount the number of elements in the set 'a'
+ * @param b the second set
+ * @param bCount the number of elements in the set 'b'
+ * @param compare the sorting method for both sets
+ * @param elementSize the sizeof the element in the two sorted sets
+ * @param in_a called for items in set 'a' but not set 'b'
+ * @param in_b called for items in set 'b' but not set 'a'
+ * @param in_both called for items that are in both sets
+ * @param userData user data passed along to in_a, in_b, and in_both
+ */
+static void
+tr_set_compare( const void * va, size_t aCount,
+                const void * vb, size_t bCount,
+                int compare( const void * a, const void * b ),
+                size_t elementSize,
+                tr_set_func in_a_cb,
+                tr_set_func in_b_cb,
+                tr_set_func in_both_cb,
+                void * userData )
+{
+    const uint8_t * a = va;
+    const uint8_t * b = vb;
+    const uint8_t * aend = a + elementSize * aCount;
+    const uint8_t * bend = b + elementSize * bCount;
+
+    while( a != aend || b != bend )
+    {
+        if( a == aend )
+        {
+            ( *in_b_cb )( (void*)b, userData );
+            b += elementSize;
+        }
+        else if( b == bend )
+        {
+            ( *in_a_cb )( (void*)a, userData );
+            a += elementSize;
+        }
+        else
+        {
+            const int val = ( *compare )( a, b );
+
+            if( !val )
+            {
+                ( *in_both_cb )( (void*)a, userData );
+                a += elementSize;
+                b += elementSize;
+            }
+            else if( val < 0 )
+            {
+                ( *in_a_cb )( (void*)a, userData );
+                a += elementSize;
+            }
+            else if( val > 0 )
+            {
+                ( *in_b_cb )( (void*)b, userData );
+                b += elementSize;
+            }
+        }
+    }
+}
+
 
 static void

trunk/libtransmission/utils.c

@@ -354 +354 @@
 {
     return memcpy( tr_malloc( byteCount ), src, byteCount );
-}
-
-/***
-****
-***/
-
-void
-tr_set_compare( const void * va, size_t aCount,
-                const void * vb, size_t bCount,
-                int compare( const void * a, const void * b ),
-                size_t elementSize,
-                tr_set_func in_a_cb,
-                tr_set_func in_b_cb,
-                tr_set_func in_both_cb,
-                void * userData )
-{
-    const uint8_t * a = va;
-    const uint8_t * b = vb;
-    const uint8_t * aend = a + elementSize * aCount;
-    const uint8_t * bend = b + elementSize * bCount;
-
-    while( a != aend || b != bend )
-    {
-        if( a == aend )
-        {
-            ( *in_b_cb )( (void*)b, userData );
-            b += elementSize;
-        }
-        else if( b == bend )
-        {
-            ( *in_a_cb )( (void*)a, userData );
-            a += elementSize;
-        }
-        else
-        {
-            const int val = ( *compare )( a, b );
-
-            if( !val )
-            {
-                ( *in_both_cb )( (void*)a, userData );
-                a += elementSize;
-                b += elementSize;
-            }
-            else if( val < 0 )
-            {
-                ( *in_a_cb )( (void*)a, userData );
-                a += elementSize;
-            }
-            else if( val > 0 )
-            {
-                ( *in_b_cb )( (void*)b, userData );
-                b += elementSize;
-            }
-        }
-    }
 }
 

trunk/libtransmission/utils.h

@@ -405 +405 @@
 typedef void ( tr_set_func )( void * element, void * userData );
 
-/**
- * @brief find the differences and commonalities in two sorted sets
- * @param a the first set
- * @param aCount the number of elements in the set 'a'
- * @param b the second set
- * @param bCount the number of elements in the set 'b'
- * @param compare the sorting method for both sets
- * @param elementSize the sizeof the element in the two sorted sets
- * @param in_a called for items in set 'a' but not set 'b'
- * @param in_b called for items in set 'b' but not set 'a'
- * @param in_both called for items that are in both sets
- * @param userData user data passed along to in_a, in_b, and in_both
- */
-void tr_set_compare( const void * a, size_t aCount,
-                     const void * b, size_t bCount,
-                     int compare( const void * a, const void * b ),
-                     size_t elementSize,
-                     tr_set_func in_a_cb,
-                     tr_set_func in_b_cb,
-                     tr_set_func in_both_cb,
-                     void * userData );
-
 int compareInt( const void * va, const void * vb );