Changeset 6616

Timestamp:

Aug 21, 2008, 7:03:56 PM (15 years ago)

Author:

charles

Message:

(libT) remove some dead functions: tr_calloc(), tr_compareUint16(), tr_compareUint32()

Location:

trunk/libtransmission

Files:

• peer-mgr.c (modified) (2 diffs)
• peer-msgs.c (modified) (1 diff)
• utils.c (modified) (3 diffs)
• utils.h (modified) (2 diffs)

trunk/libtransmission/peer-mgr.c

@@ -185 +185 @@
 compareAddresses( const struct in_addr * a, const struct in_addr * b )
 {
-    return tr_compareUint32( a->s_addr, b->s_addr );
+    return a->s_addr - b->s_addr;
 }
 
@@ -1768 +1768 @@
     if( a->piece_data_time < b->piece_data_time ) return  1;
 
-    if(( i = tr_compareUint16( a->numFails, b->numFails )))
+    if(( i = a->numFails - b->numFails ))
         return i;
 

trunk/libtransmission/peer-msgs.c

@@ -117 +117 @@
     time_t time_requested;
 };
+
+static int
+tr_compareUint32( uint32_t a, uint32_t b )
+{
+    if( a < b ) return -1;
+    if( a > b ) return 1;
+    return 0;
+}
 
 static int

trunk/libtransmission/utils.c

@@ -326 +326 @@
 
 int
-tr_compareUint16( uint16_t a, uint16_t b )
-{
-    if( a < b ) return -1;
-    if( a > b ) return 1;
-    return 0;
-}
-
-int
-tr_compareUint32( uint32_t a, uint32_t b )
-{
-    if( a < b ) return -1;
-    if( a > b ) return 1;
-    return 0;
-}
-
-int
 tr_compareUint64( uint64_t a, uint64_t b )
 {
@@ -673 +657 @@
 
 void*
-tr_calloc( size_t nmemb, size_t size )
-{
-    return nmemb && size ? calloc( nmemb, size ) : NULL;
-}
-
-void*
 tr_malloc( size_t size )
 {
@@ -725 +703 @@
 tr_bitfieldDup( const tr_bitfield * in )
 {
-    tr_bitfield * ret = calloc( 1, sizeof(tr_bitfield) );
+    tr_bitfield * ret = tr_new0( tr_bitfield, 1 );
     ret->bitCount = in->bitCount;
     ret->byteCount = in->byteCount;

trunk/libtransmission/utils.h

@@ -184 +184 @@
 void* tr_malloc  ( size_t ) TR_GNUC_MALLOC;
 void* tr_malloc0 ( size_t ) TR_GNUC_MALLOC;
-void* tr_calloc  ( size_t nmemb, size_t size ) TR_GNUC_MALLOC;
 void  tr_free    ( void* );
 
@@ -214 +213 @@
                      void * userData );
                     
-int tr_compareUint16( uint16_t a, uint16_t b );
-int tr_compareUint32( uint32_t a, uint32_t b );
 int tr_compareUint64( uint64_t a, uint64_t b );
 int tr_compareDouble( double a, double b );