Changeset 7410

Timestamp:

Dec 16, 2008, 6:46:27 AM (12 years ago)

Author:

charles

Message:

(trunk libT) add some assertions to tr_compareAddresses()

File:

• trunk/libtransmission/net.c (modified) (2 diffs)

trunk/libtransmission/net.c

@@ -128 +128 @@
  * 0  if a == b 
  */ 
-int 
-tr_compareAddresses( const tr_address * a, const tr_address * b) 
-{ 
-    int retval; 
-    int addrlen; 
+int
+tr_compareAddresses( const tr_address * a, const tr_address * b)
+{
+    int addrlen;
+
+    assert( a );
+    assert( b );
+    assert( a->type == TR_AF_INET || a->type == TR_AF_INET6 );
+    assert( b->type == TR_AF_INET || b->type == TR_AF_INET6 );
 
     /* IPv6 addresses are always "greater than" IPv4 */ 
-    if( a->type == TR_AF_INET && b->type == TR_AF_INET6 ) 
-        return 1; 
-    if( a->type == TR_AF_INET6 && b->type == TR_AF_INET ) 
-        return -1; 
+    if( a->type != b->type )
+        return a->type == TR_AF_INET ? 1 : -1;
 
     if( a->type == TR_AF_INET ) 
@@ -144 +146 @@
     else 
         addrlen = sizeof( struct in6_addr ); 
-    retval = memcmp( &a->addr, &b->addr, addrlen ); 
-    if( retval == 0 ) 
-        return 0; 
-     
-    return retval; 
+    return memcmp( &a->addr, &b->addr, addrlen );
 }