Changeset 6622

Timestamp:

Aug 22, 2008, 2:15:37 AM (15 years ago)

Author:

muks

Message:

Further fix/cleanup compare code

File:

• trunk/libtransmission/peer-mgr.c (modified) (4 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 );
+    if (a->s_addr != b->s_addr)
+        return a->s_addr < b->s_addr ? -1 : 1;
+
+    return 0;
 }
 
@@ -565 +568 @@
     if( a->priority != b->priority )
         return a->priority > b->priority ? -1 : 1;
-   
+
     /* otherwise if one has fewer peers, it goes first */
     if (a->peerCount != b->peerCount)
@@ -571 +574 @@
 
     /* otherwise go with our random seed */
-    return a->random - b->random;
+    if (a->random != b->random)
+        return a->random < b->random ? -1 : 1;
+
+    return 0;
 }
 
@@ -1772 +1778 @@
     const struct peer_atom * b = * (const struct peer_atom**) vb;
 
-    if( a->piece_data_time > b->piece_data_time ) return -1;
-    if( a->piece_data_time < b->piece_data_time ) return  1;
+    if( a->piece_data_time != b->piece_data_time )
+        return a->piece_data_time < b->piece_data_time ? -1 : 1;
 
     if( a->numFails != b->numFails )