(trunk libT) copyediting.

1. make some accidentally-public functions/variables private
2. comment out tr_generateAllowedSet() since we're not using it
3. argument list indentation

diff --git a/libtransmission/peer-mgr.c b/libtransmission/peer-mgr.c
index dd9b32297a0708ad1ac6d250d20bdae465e44bdd..88736af97b66f6439ecadab229c758d3bd45c754 100644 (file)
--- a/libtransmission/peer-mgr.c
+++ b/libtransmission/peer-mgr.c
@@ -920,9 +920,9 @@ invalidatePieceSorting( Torrent * t )
     t->pieceSortState = PIECES_UNSORTED;
 }
 
-const tr_torrent * weightTorrent;
+static const tr_torrent * weightTorrent;
 
-const uint16_t * weightReplication;
+static const uint16_t * weightReplication;
 
 static void
 setComparePieceByWeightTorrent( Torrent * t )
@@ -1616,6 +1616,8 @@ peerDeclinedAllRequests( Torrent * t, const tr_peer * peer )
     tr_free( blocks );
 }
 
+static void tr_peerMgrSetBlame( tr_torrent *, tr_piece_index_t, int );
+
 static void
 peerCallbackFunc( tr_peer * peer, const tr_peer_event * e, void * vt )
 {
@@ -2196,7 +2198,7 @@ tr_peerMgrArrayToPex( const void * array,
 ***
 **/
 
-void
+static void
 tr_peerMgrSetBlame( tr_torrent     * tor,
                     tr_piece_index_t pieceIndex,
                     int              success )
@@ -2929,8 +2931,7 @@ struct ChokeData
 };
 
 static int
-compareChoke( const void * va,
-              const void * vb )
+compareChoke( const void * va, const void * vb )
 {
     const struct ChokeData * a = va;
     const struct ChokeData * b = vb;

diff --git a/libtransmission/peer-mgr.h b/libtransmission/peer-mgr.h
index 47b81ea38cbf0a53809216f43af5de26e2978ee8..1332ca233ea69807489dfc5ed34ecd28cf4119a1 100644 (file)
--- a/libtransmission/peer-mgr.h
+++ b/libtransmission/peer-mgr.h
@@ -204,10 +204,6 @@ void tr_peerMgrAddPex( tr_torrent     * tor,
 
 void tr_peerMgrMarkAllAsSeeds( tr_torrent * tor );
 
-void tr_peerMgrSetBlame( tr_torrent        * tor,
-                         tr_piece_index_t    pieceIndex,
-                         int                 success );
-
 enum
 {
     TR_PEERS_CONNECTED,

diff --git a/libtransmission/peer-msgs-test.c b/libtransmission/peer-msgs-test.c
index 37598b956873a9b1125247b3f5ce11f452ff5225..0367ad37c4e67f8da78de0bcbfbeec75e9cf894b 100644 (file)
--- a/libtransmission/peer-msgs-test.c
+++ b/libtransmission/peer-msgs-test.c
@@ -31,6 +31,7 @@
 int
 main( void )
 {
+#if 0
     uint32_t           i;
     int                test = 0;
     uint8_t            infohash[SHA_DIGEST_LENGTH];
@@ -56,6 +57,7 @@ main( void )
     check( numgot == numwant );
     for( i=0; i<numgot; ++i )
         check( buf[i] == pieces[i] );
+#endif
 
     return 0;
 }

diff --git a/libtransmission/peer-msgs.c b/libtransmission/peer-msgs.c
index 7cd7283da797893bb55f8023403c71c74fdf390a..c55394b262a907e4d4cf07247466f96a5d07dd1f 100644 (file)
--- a/libtransmission/peer-msgs.c
+++ b/libtransmission/peer-msgs.c
@@ -282,8 +282,7 @@ myDebug( const char * file, int line,
 **/
 
 static void
-pokeBatchPeriod( tr_peermsgs * msgs,
-                 int           interval )
+pokeBatchPeriod( tr_peermsgs * msgs, int interval )
 {
     if( msgs->outMessagesBatchPeriod > interval )
     {
@@ -503,9 +502,7 @@ fireClientGotHaveNone( tr_peermsgs * msgs )
 }
 
 static void
-fireClientGotData( tr_peermsgs * msgs,
-                   uint32_t      length,
-                   int           wasPieceData )
+fireClientGotData( tr_peermsgs * msgs, uint32_t length, int wasPieceData )
 {
     tr_peer_event e = TR_PEER_EVENT_INIT;
 
@@ -561,9 +558,7 @@ fireClientGotHave( tr_peermsgs * msgs, tr_piece_index_t index )
 }
 
 static void
-firePeerGotData( tr_peermsgs  * msgs,
-                 uint32_t       length,
-                 int            wasPieceData )
+firePeerGotData( tr_peermsgs * msgs, uint32_t length, tr_bool wasPieceData )
 {
     tr_peer_event e = TR_PEER_EVENT_INIT;
 
@@ -579,6 +574,7 @@ firePeerGotData( tr_peermsgs  * msgs,
 ***  For explanation, see http://www.bittorrent.org/beps/bep_0006.html
 **/
 
+#if 0
 size_t
 tr_generateAllowedSet( tr_piece_index_t * setmePieces,
                        size_t             desiredSetSize,
@@ -636,7 +632,6 @@ tr_generateAllowedSet( tr_piece_index_t * setmePieces,
 static void
 updateFastSet( tr_peermsgs * msgs UNUSED )
 {
-#if 0
     const tr_bool fext = tr_peerIoSupportsFEXT( msgs->peer->io );
     const int peerIsNeedy = msgs->peer->progress < 0.10;
 
@@ -655,8 +650,8 @@ updateFastSet( tr_peermsgs * msgs UNUSED )
         for( i=0; i<msgs->fastsetSize; ++i )
             protocolSendAllowedFast( msgs, msgs->fastset[i] );
     }
-#endif
 }
+#endif
 
 /**
 ***  INTEREST
@@ -734,8 +729,7 @@ cancelAllRequestsToClient( tr_peermsgs * msgs )
 }
 
 void
-tr_peerMsgsSetChoke( tr_peermsgs * msgs,
-                     int           choke )
+tr_peerMsgsSetChoke( tr_peermsgs * msgs, int choke )
 {
     const time_t now = tr_time( );
     const time_t fibrillationTime = now - MIN_CHOKE_PERIOD_SEC;
@@ -763,8 +757,7 @@ tr_peerMsgsSetChoke( tr_peermsgs * msgs,
 **/
 
 void
-tr_peerMsgsHave( tr_peermsgs * msgs,
-                 uint32_t      index )
+tr_peerMsgsHave( tr_peermsgs * msgs, uint32_t index )
 {
     protocolSendHave( msgs, index );
 
@@ -867,9 +860,7 @@ sendLtepHandshake( tr_peermsgs * msgs )
 }
 
 static void
-parseLtepHandshake( tr_peermsgs *     msgs,
-                    int               len,
-                    struct evbuffer * inbuf )
+parseLtepHandshake( tr_peermsgs * msgs, int len, struct evbuffer * inbuf )
 {
     int64_t   i;
     tr_benc   val, * sub;
@@ -1148,9 +1139,7 @@ parseLtep( tr_peermsgs * msgs, int msglen, struct evbuffer  * inbuf )
 }
 
 static int
-readBtLength( tr_peermsgs *     msgs,
-              struct evbuffer * inbuf,
-              size_t            inlen )
+readBtLength( tr_peermsgs * msgs, struct evbuffer * inbuf, size_t inlen )
 {
     uint32_t len;
 
@@ -1170,12 +1159,10 @@ readBtLength( tr_peermsgs *     msgs,
     return READ_NOW;
 }
 
-static int readBtMessage( tr_peermsgs     * msgs,
-                          struct evbuffer * inbuf,
-                          size_t            inlen );
+static int readBtMessage( tr_peermsgs *, struct evbuffer *, size_t );
 
 static int
-readBtId( tr_peermsgs * msgs, struct evbuffer  * inbuf, size_t inlen )
+readBtId( tr_peermsgs * msgs, struct evbuffer * inbuf, size_t inlen )
 {
     uint8_t id;
 
@@ -1204,7 +1191,7 @@ updatePeerProgress( tr_peermsgs * msgs )
 {
     tr_peerUpdateProgress( msgs->torrent, msgs->peer );
 
-    updateFastSet( msgs );
+    /*updateFastSet( msgs );*/
     updateInterest( msgs );
 }
 
@@ -1229,8 +1216,7 @@ prefetchPieces( tr_peermsgs *msgs )
 }
 
 static void
-peerMadeRequest( tr_peermsgs *               msgs,
-                 const struct peer_request * req )
+peerMadeRequest( tr_peermsgs * msgs, const struct peer_request * req )
 {
     const tr_bool fext = tr_peerIoSupportsFEXT( msgs->peer->io );
     const int reqIsValid = requestIsValid( msgs, req );
@@ -1593,9 +1579,9 @@ addPeerToBlamefield( tr_peermsgs * msgs, uint32_t index )
 
 /* returns 0 on success, or an errno on failure */
 static int
-clientGotBlock( tr_peermsgs *               msgs,
-                struct evbuffer *           data,
-                const struct peer_request * req )
+clientGotBlock( tr_peermsgs                * msgs,
+                struct evbuffer            * data,
+                const struct peer_request  * req )
 {
     int err;
     tr_torrent * tor = msgs->torrent;
@@ -2020,9 +2006,7 @@ tr_peerMsgsPulse( tr_peermsgs * msgs )
 }
 
 static void
-gotError( tr_peerIo  * io UNUSED,
-          short        what,
-          void       * vmsgs )
+gotError( tr_peerIo * io UNUSED, short what, void * vmsgs )
 {
     if( what & BEV_EVENT_TIMEOUT )
         dbgmsg( vmsgs, "libevent got a timeout, what=%hd", what );
@@ -2088,8 +2072,7 @@ typedef struct
 PexDiffs;
 
 static void
-pexAddedCb( void * vpex,
-            void * userData )
+pexAddedCb( void * vpex, void * userData )
 {
     PexDiffs * diffs = userData;
     tr_pex *   pex = vpex;
@@ -2102,8 +2085,7 @@ pexAddedCb( void * vpex,
 }
 
 static inline void
-pexDroppedCb( void * vpex,
-              void * userData )
+pexDroppedCb( void * vpex, void * userData )
 {
     PexDiffs * diffs = userData;
     tr_pex *   pex = vpex;
@@ -2115,8 +2097,7 @@ pexDroppedCb( void * vpex,
 }
 
 static inline void
-pexElementCb( void * vpex,
-              void * userData )
+pexElementCb( void * vpex, void * userData )
 {
     PexDiffs * diffs = userData;
     tr_pex * pex = vpex;