Changeset 12606

Timestamp:

Jul 31, 2011, 2:04:43 PM (12 years ago)

Author:

jordan

Message:

(trunk libT) Remove the backup implementation of tr_ptrArrayLowerBound() that was added 5 weeks ago in r12512. This was for testing in the nightlies, to use its output against the function's primary implementation.

File:

• trunk/libtransmission/ptrarray.c (modified) (4 diffs)

trunk/libtransmission/ptrarray.c

@@ -113 +113 @@
 **/
 
-#ifndef NDEBUG
-static int
-lowerBound2( const tr_ptrArray * t,
-             const void * ptr,
-             int compare( const void *, const void * ),
-             bool * exact_match )
-{
-    int i;
-    const int len = t->n_items;
-
-    for( i=0; i<len; ++i )
-    {
-        const int c = compare( t->items[i], ptr );
-
-        if( c == 0 ) {
-            *exact_match = true;
-            return i;
-        }
-
-        if( c < 0 )
-            continue;
-
-        *exact_match = false;
-        return i;
-    }
-
-    *exact_match = false;
-    return len;
-}
-#endif
-
 int
 tr_ptrArrayLowerBound( const tr_ptrArray  * t,
@@ -152 +121 @@
     int pos = -1;
     bool match = false;
-#ifndef NDEBUG
-    bool match_2;
-#endif
 
     if( t->n_items == 0 )
@@ -194 +160 @@
     }
 
-    assert( pos == lowerBound2( t, ptr, compare, &match_2 ) );
-    assert( match == match_2 );
-
     if( exact_match )
         *exact_match = match;
@@ -206 +169 @@
                        int compare(const void*, const void*) UNUSED )
 {
-#if 1
+#ifndef NDEBUG
     int i;