Changeset 7456 for trunk/libtransmission/peer-msgs.c

Timestamp:

Dec 22, 2008, 12:52:44 AM (12 years ago)

Author:

charles

Message:

(trunk libT) minor cleanups found while diffing for backport to 1.4x in r7455

File:

• trunk/libtransmission/peer-msgs.c (modified) (14 diffs)

trunk/libtransmission/peer-msgs.c

@@ -402 +402 @@
 
 static void
-protocolSendRequest( tr_peermsgs *               msgs,
+protocolSendRequest( tr_peermsgs               * msgs,
                      const struct peer_request * req )
 {
@@ -420 +420 @@
 
 static void
-protocolSendCancel( tr_peermsgs *               msgs,
+protocolSendCancel( tr_peermsgs               * msgs,
                     const struct peer_request * req )
 {
@@ -448 +448 @@
     tr_peerIoWriteUint32( io, out, index );
 
-    dbgmsg( msgs, "sending Have %u...", index );
+    dbgmsg( msgs, "sending Have %u", index );
     dbgOutMessageLen( msgs );
     pokeBatchPeriod( msgs, LOW_PRIORITY_INTERVAL_SECS );
@@ -773 +773 @@
     tr_peerIoWriteUint32( msgs->peer->io, out, sizeof( uint8_t ) );
     tr_peerIoWriteUint8 ( msgs->peer->io, out, weAreInterested ? BT_INTERESTED : BT_NOT_INTERESTED );
+
     pokeBatchPeriod( msgs, HIGH_PRIORITY_INTERVAL_SECS );
     dbgOutMessageLen( msgs );
@@ -876 +877 @@
     oldestAllowed = now - QUEUED_REQUEST_TTL_SECS;
     reqListCopy( &tmp, &msgs->clientWillAskFor );
-    for( i = 0; i < tmp.count; ++i ) {
+    for( i=0; i<tmp.count; ++i ) {
         const struct peer_request * req = &tmp.requests[i];
         if( req->time_requested < oldestAllowed )
@@ -934 +935 @@
     if( sent )
         dbgmsg( msgs, "pump sent %d requests, now have %d active and %d queued",
-                sent,
-                msgs->clientAskedFor.count,
-                msgs->clientWillAskFor.count );
+                sent, msgs->clientAskedFor.count, msgs->clientWillAskFor.count );
 
     if( count < max )
@@ -953 +952 @@
                        uint32_t         index,
                        uint32_t         offset,
-                       uint32_t         length,
-                       int              doForce )
+                       uint32_t         length )
 {
     struct peer_request req;
@@ -967 +965 @@
 
     /* don't send requests to choked clients */
-    if( !doForce && msgs->peer->clientIsChoked ) {
+    if( msgs->peer->clientIsChoked ) {
         dbgmsg( msgs, "declining request because they're choking us" );
         return TR_ADDREQ_CLIENT_CHOKED;
@@ -973 +971 @@
 
     /* peer doesn't have this piece */
-    if( !doForce && !tr_bitfieldHas( msgs->peer->have, index ) )
+    if( !tr_bitfieldHas( msgs->peer->have, index ) )
         return TR_ADDREQ_MISSING;
 
     /* peer's queue is full */
-    if( !doForce && requestQueueIsFull( msgs ) ) {
+    if( requestQueueIsFull( msgs ) ) {
         dbgmsg( msgs, "declining request because we're full" );
         return TR_ADDREQ_FULL;
@@ -986 +984 @@
     req.offset = offset;
     req.length = length;
-    if( !doForce ) {
-        if( reqListFind( &msgs->clientAskedFor, &req ) != -1 ) {
-            dbgmsg( msgs, "declining because it's a duplicate" );
-            return TR_ADDREQ_DUPLICATE;
-        }
-        if( reqListFind( &msgs->clientWillAskFor, &req ) != -1 ) {
-            dbgmsg( msgs, "declining because it's a duplicate" );
-            return TR_ADDREQ_DUPLICATE;
-        }
+    if( reqListFind( &msgs->clientAskedFor, &req ) != -1 ) {
+        dbgmsg( msgs, "declining because it's a duplicate" );
+        return TR_ADDREQ_DUPLICATE;
+    }
+    if( reqListFind( &msgs->clientWillAskFor, &req ) != -1 ) {
+        dbgmsg( msgs, "declining because it's a duplicate" );
+        return TR_ADDREQ_DUPLICATE;
     }
 
@@ -1582 +1578 @@
             break;
 
-
         case BT_FEXT_HAVE_NONE:
             dbgmsg( msgs, "Got a BT_FEXT_HAVE_NONE" );
@@ -1781 +1776 @@
     size_t bytesWritten = 0;
     struct peer_request req;
-    const int haveMessages = EVBUFFER_LENGTH( msgs->outMessages ) != 0;
+    const tr_bool haveMessages = EVBUFFER_LENGTH( msgs->outMessages ) != 0;
     const tr_bool fext = tr_peerIoSupportsFEXT( msgs->peer->io );
 
@@ -1881 +1876 @@
 tr_peerMsgsPulse( tr_peermsgs * msgs )
 {
-    if( msgs )
+    if( msgs != NULL )
         peerPulse( msgs );
 }
@@ -2203 +2198 @@
 tr_peermsgs*
 tr_peerMsgsNew( struct tr_torrent * torrent,
-                struct tr_peer *    peer,
+                struct tr_peer    * peer,
                 tr_delivery_func    func,
-                void *              userData,
-                tr_publisher_tag *  setme )
+                void              * userData,
+                tr_publisher_tag  * setme )
 {
     tr_peermsgs * m;