Changeset 9089

Timestamp:

Sep 10, 2009, 3:28:55 AM (13 years ago)

Author:

charles

Message:

(trunk libT) fix a couple of compiler warnings from the last commit.

File:

• trunk/libtransmission/peer-mgr.c (modified) (4 diffs)

trunk/libtransmission/peer-mgr.c

@@ -124 +124 @@
 };
 
+static tr_bool
+tr_isAtom( const struct peer_atom * atom )
+{
+    return ( atom != NULL )
+        && ( atom->from < TR_PEER_FROM__MAX )
+        && ( tr_isAddress( &atom->addr ) );
+}
+
 struct tr_blockIterator
 {
@@ -245 +253 @@
     const struct peer_atom * b = vb;
 
-    assert( tr_isAddress( &b->addr ) );
-    assert( ( 0 <= b->from ) && ( b->from < TR_PEER_FROM__MAX ) );
+    assert( tr_isAtom( b ) );
 
     return comparePeerAtomToAddress( va, &b->addr );
@@ -1196 +1203 @@
 {
     assert( tr_isAddress( addr ) );
-    assert( ( 0 <= from ) && ( from < TR_PEER_FROM__MAX ) );
+    assert( from < TR_PEER_FROM__MAX );
 
     if( getExistingAtom( t, addr ) == NULL )
@@ -1534 +1541 @@
     const struct peer_atom * b = * (const struct peer_atom**) vb;
 
-    assert( ( 0 <= a->from ) && ( a->from < TR_PEER_FROM__MAX ) );
-    assert( ( 0 <= b->from ) && ( b->from < TR_PEER_FROM__MAX ) );
+    assert( tr_isAtom( a ) );
+    assert( tr_isAtom( b ) );
 
     if( a->piece_data_time != b->piece_data_time )