Changeset 7235

Timestamp:

Dec 2, 2008, 6:24:26 PM (12 years ago)

Author:

charles

Message:

(libT) misc cleanup

Location:

trunk/libtransmission

Files:

• peer-msgs.c (modified) (2 diffs)
• torrent.c (modified) (2 diffs)
• tracker.c (modified) (1 diff)
• tracker.h (modified) (1 diff)

trunk/libtransmission/peer-msgs.c

@@ -445 +445 @@
 }
 
+#if 0
 static void
 protocolSendAllowedFast( tr_peermsgs * msgs, uint32_t pieceIndex )
@@ -460 +461 @@
     dbgOutMessageLen( msgs );
 }
+#endif
 
 static void

trunk/libtransmission/torrent.c

@@ -1102 +1102 @@
     tr_globalLock( tor->session );
 
-    tor->isRunning  = 1;
+    tor->isRunning = 1;
     *tor->errorString = '\0';
     tr_torrentResetTransferStats( tor );
@@ -1341 +1341 @@
 tr_torrentIsSeed( const tr_torrent * tor )
 {
-    return tor->completeness == TR_SEED || tor->completeness == TR_PARTIAL_SEED;
+    return tor->completeness != TR_LEECH;
 }
 

trunk/libtransmission/tracker.c

@@ -687 +687 @@
                               "&port=%d"
                               "&uploaded=%" PRIu64
-                        "&downloaded=%" PRIu64
-                        "&corrupt=%" PRIu64
-                        "&left=%" PRIu64
-                        "&compact=1"
-                        "&numwant=%d"
-                        "&key=%s"
-                        "%s%s"
-                        "%s%s",
-                        strchr( ann, '?' ) ? '&' : '?',
-                        t->escaped,
-                        t->peer_id,
-                        tr_sessionGetPeerPort( t->session ),
-                        torrent->uploadedCur,
-                        torrent->downloadedCur,
-                        torrent->corruptCur,
-                        tr_cpLeftUntilComplete( torrent->completion ),
-                        numwant,
-                        t->key_param,
-                        ( ( eventName && *eventName ) ? "&event=" : "" ),
-                        ( ( eventName && *eventName ) ? eventName : "" ),
-                        ( ( t->trackerID
-                          && *t->trackerID ) ? "&trackerid=" : "" ),
-                        ( ( t->trackerID
-                          && *t->trackerID ) ? t->trackerID : "" ) );
+                              "&downloaded=%" PRIu64
+                              "&corrupt=%" PRIu64
+                              "&left=%" PRIu64
+                              "&compact=1"
+                              "&numwant=%d"
+                              "&key=%s",
+                              strchr( ann, '?' ) ? '&' : '?',
+                              t->escaped,
+                              t->peer_id,
+                              tr_sessionGetPeerPort( t->session ),
+                              torrent->uploadedCur,
+                              torrent->downloadedCur,
+                              torrent->corruptCur,
+                              tr_cpLeftUntilComplete( torrent->completion ),
+                              numwant,
+                              t->key_param );
+
+    if( eventName && *eventName )
+        evbuffer_add_printf( buf, "&event=%s", eventName );
+
+    if( t->trackerID && *t->trackerID )
+        evbuffer_add_printf( buf, "&trackerid=%s", t->trackerID );
+
 }
 

trunk/libtransmission/tracker.h

@@ -91 +91 @@
 const tr_tracker_info * tr_trackerGetAddress( struct tr_tracker * );
 
-int                     tr_trackerCanManualAnnounce(
-    const struct tr_tracker * );
+int                     tr_trackerCanManualAnnounce( const struct tr_tracker * );
 
-time_t                  tr_trackerGetManualAnnounceTime(
-    const struct tr_tracker * );
+time_t                  tr_trackerGetManualAnnounceTime( const struct tr_tracker * );
 
-void                    tr_trackerGetCounts(
-    const struct tr_tracker *,
-    int *
-                 setme_completedCount,
-    int *
-                 setme_leecherCount,
-    int *        setme_seederCount );
+void                    tr_trackerGetCounts( const struct tr_tracker *,
+                                             int * setme_completedCount,
+                                             int * setme_leecherCount,
+                                             int * setme_seederCount );
 
 #endif