Changeset 7614 for trunk/libtransmission/peer-mgr.c

Timestamp:

Jan 4, 2009, 4:59:15 PM (12 years ago)

Author:

charles

Message:

(trunk libT) minor tr_ptrArray API cleanup

File:

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

trunk/libtransmission/peer-mgr.c

@@ -620 +620 @@
     assert( torrentIsLocked( t ) );
 
-    peers = (const tr_peer**) TR_PTR_ARRAY_DATA( &t->peers );
-    peerCount = TR_PTR_ARRAY_LENGTH( &t->peers );
+    peers = (const tr_peer**) tr_ptrArrayBase( &t->peers );
+    peerCount = tr_ptrArraySize( &t->peers );
 
     /* make a list of the pieces that we want but don't have */
@@ -791 +791 @@
     peers = getPeersUploadingToClient( t, &peerCount );
     webseedCount = tr_ptrArraySize( &t->webseeds );
-    webseeds = tr_memdup( TR_PTR_ARRAY_DATA( &t->webseeds ),
+    webseeds = tr_memdup( tr_ptrArrayBase( &t->webseeds ),
                           webseedCount * sizeof( tr_webseed* ) );
 
@@ -874 +874 @@
     tordbg( t, "got a block; cancelling any duplicate requests from peers %"PRIu32":%"PRIu32"->%"PRIu32, index, offset, length );
 
-    peerCount = TR_PTR_ARRAY_LENGTH( &t->peers );
-    peers = (tr_peer**) TR_PTR_ARRAY_DATA( &t->peers );
+    peerCount = tr_ptrArraySize( &t->peers );
+    peers = (tr_peer**) tr_ptrArrayBase( &t->peers );
     for( i=0; i<peerCount; ++i )
         if( peers[i]->msgs )
@@ -1104 +1104 @@
                 {
                     int i;
-                    int peerCount = TR_PTR_ARRAY_LENGTH( &t->peers );
-                    tr_peer ** peers = (tr_peer**) TR_PTR_ARRAY_DATA( &t->peers );
+                    int peerCount = tr_ptrArraySize( &t->peers );
+                    tr_peer ** peers = (tr_peer**) tr_ptrArrayBase( &t->peers );
                     for( i=0; i<peerCount; ++i )
                         tr_peerMsgsHave( peers[i]->msgs, p );
@@ -1502 +1502 @@
     {
         int i;
-        const tr_peer ** peers = (const tr_peer**) TR_PTR_ARRAY_DATA( &t->peers );
-        const int peerCount = TR_PTR_ARRAY_LENGTH( &t->peers );
+        const tr_peer ** peers = (const tr_peer**) tr_ptrArrayBase( &t->peers );
+        const int peerCount = tr_ptrArraySize( &t->peers );
         /* for now, this will waste memory on torrents that have both
          * ipv6 and ipv4 peers */
@@ -1662 +1662 @@
     interval = tor->info.pieceCount / (float)tabCount;
     isSeed = tor && ( tr_cpGetStatus ( &tor->completion ) == TR_SEED );
-    peers = (const tr_peer **) TR_PTR_ARRAY_DATA( &t->peers );
-    peerCount = TR_PTR_ARRAY_LENGTH( &t->peers );
+    peers = (const tr_peer **) tr_ptrArrayBase( &t->peers );
+    peerCount = tr_ptrArraySize( &t->peers );
 
     memset( tab, 0, tabCount );
@@ -1698 +1698 @@
     t = getExistingTorrent( (tr_peerMgr*)manager, torrentHash );
     pieces = tr_bitfieldNew( t->tor->info.pieceCount );
-    peerCount = TR_PTR_ARRAY_LENGTH( &t->peers );
-    peers = (const tr_peer**) TR_PTR_ARRAY_DATA( &t->peers );
+    peerCount = tr_ptrArraySize( &t->peers );
+    peers = (const tr_peer**) tr_ptrArrayBase( &t->peers );
     for( i=0; i<peerCount; ++i )
         tr_bitfieldOr( pieces, peers[i]->have );
@@ -1741 +1741 @@
 
     t = getExistingTorrent( (tr_peerMgr*)manager, torrentHash );
-    peers = (const tr_peer **) TR_PTR_ARRAY_DATA( &t->peers );
-    size = TR_PTR_ARRAY_LENGTH( &t->peers );
+    peers = (const tr_peer **) tr_ptrArrayBase( &t->peers );
+    size = tr_ptrArraySize( &t->peers );
 
     *setmePeersKnown           = tr_ptrArraySize( &t->pool );
@@ -1776 +1776 @@
     }
 
-    webseeds = (const tr_webseed**) TR_PTR_ARRAY_DATA( &t->webseeds );
-    size = TR_PTR_ARRAY_LENGTH( &t->webseeds );
+    webseeds = (const tr_webseed**) tr_ptrArrayBase( &t->webseeds );
+    size = tr_ptrArraySize( &t->webseeds );
     for( i=0; i<size; ++i )
         if( tr_webseedIsActive( webseeds[i] ) )
@@ -1799 +1799 @@
 
     t = getExistingTorrent( (tr_peerMgr*)manager, torrentHash );
-    webseeds = (const tr_webseed**) TR_PTR_ARRAY_DATA( &t->webseeds );
-    webseedCount = TR_PTR_ARRAY_LENGTH( &t->webseeds );
+    webseeds = (const tr_webseed**) tr_ptrArrayBase( &t->webseeds );
+    webseedCount = tr_ptrArraySize( &t->webseeds );
     assert( webseedCount == t->tor->info.webseedCount );
     ret = tr_new0( float, webseedCount );
@@ -1833 +1833 @@
 
     t = getExistingTorrent( (tr_peerMgr*)manager, torrentHash );
-    size = TR_PTR_ARRAY_LENGTH( &t->peers );
-    peers = (const tr_peer**) TR_PTR_ARRAY_DATA( &t->peers );
+    size = tr_ptrArraySize( &t->peers );
+    peers = (const tr_peer**) tr_ptrArrayBase( &t->peers );
     ret = tr_new0( tr_peer_stat, size );
 
@@ -1934 +1934 @@
 {
     int i, size, unchokedInterested;
-    const int peerCount = TR_PTR_ARRAY_LENGTH( &t->peers );
-    tr_peer ** peers = (tr_peer**) TR_PTR_ARRAY_DATA( &t->peers );
+    const int peerCount = tr_ptrArraySize( &t->peers );
+    tr_peer ** peers = (tr_peer**) tr_ptrArrayBase( &t->peers );
     struct ChokeData * choke = tr_new0( struct ChokeData, peerCount );
     const int chokeAll = !tr_torrentIsPieceTransferAllowed( t->tor, TR_CLIENT_TO_PEER );