Changeset 2184

Timestamp:

Jun 22, 2007, 4:30:39 AM (15 years ago)

Author:

charles

Message:

misc cleanup.. ansification; fix my own typos, etc...

Location:

trunk/libtransmission

Files:

• makemeta.c (modified) (3 diffs)
• makemeta.h (modified) (1 diff)
• peer.c (modified) (7 diffs)
• platform.c (modified) (1 diff)
• platform.h (modified) (2 diffs)

trunk/libtransmission/makemeta.c

@@ -143 +143 @@
         ++ret->fileCount;
 
-    ret->files = tr_calloc( ret->fileCount, sizeof(tr_metainfo_builder_file_t) );
+    ret->files = tr_calloc(ret->fileCount, sizeof(tr_metainfo_builder_file_t));
 
     for( i=0, walk=files; walk!=NULL; ++i )
@@ -207 +207 @@
     {
         uint8_t *bufptr = buf;
-        const uint64_t thisPieceSize = MIN( (uint32_t)b->pieceSize, totalRemain );
+        const uint64_t thisPieceSize =
+            MIN( (uint32_t)b->pieceSize, totalRemain );
         uint64_t pieceRemain = thisPieceSize;
 
@@ -214 +215 @@
         while( pieceRemain )
         {
-            const uint64_t n_this_pass = MIN( (b->files[fileIndex].size - off), pieceRemain );
+            const uint64_t n_this_pass =
+                MIN( (b->files[fileIndex].size - off), pieceRemain );
             fread( bufptr, 1, n_this_pass, fp );
             bufptr += n_this_pass;

trunk/libtransmission/makemeta.h

@@ -22 +22 @@
 {
     /**
-    ***  These are set by tr_makeMetaInfo()
+    ***  These are set by tr_makeMetaInfoBuilderCreate()
     ***  and cleaned up by tr_metaInfoBuilderFree()
     **/

trunk/libtransmission/peer.c

@@ -57 +57 @@
 /**
  * We expend a fraction of our torrent's total upload speed
- * on on largesse by uniformly distributing free credit to
+ * on largesse by uniformly distributing free credit to
  * all of our peers.  This too helps prevent gridlock.
  */
@@ -603 +603 @@
 
         /* TODO: add some asserts to see if this bitfield is really necessary */
-        tr_bitfield_t * blocksAlreadyRequested = tr_bitfieldNew( tor->blockCount );
+        tr_bitfield_t * requestedBlocks = tr_bitfieldNew( tor->blockCount );
         for( i=0; i<peer->inRequestCount; ++i) {
             const tr_request_t * r = &peer->inRequests[i];
             const int block = tr_block( r->index, r->begin );
-            tr_bitfieldAdd( blocksAlreadyRequested, block );
+            tr_bitfieldAdd( requestedBlocks, block );
         }
 
@@ -618 +618 @@
                 : tr_cpMissingBlockInPiece ( tor->completion, piece );
 
-            if( block>=0 && (endgame || !tr_bitfieldHas( blocksAlreadyRequested, block ) ) )
+            if( block>=0 && (endgame || !tr_bitfieldHas( requestedBlocks, block ) ) )
             {
-                tr_bitfieldAdd( blocksAlreadyRequested, block );
+                tr_bitfieldAdd( requestedBlocks, block );
                 sendRequest( tor, peer, block );
             }
@@ -626 +626 @@
         }
 
-        tr_bitfieldFree( blocksAlreadyRequested );
+        tr_bitfieldFree( requestedBlocks );
         free( pool );
     }
@@ -660 +660 @@
 }
 
-/***********************************************************************
- * tr_peerProgress
- ***********************************************************************
- *
- **********************************************************************/
 float tr_peerProgress( const tr_peer_t * peer )
 {
@@ -670 +665 @@
 }
 
-/***********************************************************************
- * tr_peerPort
- ***********************************************************************
- * Returns peer's listening port in host byte order
- **********************************************************************/
 int tr_peerPort( const tr_peer_t * peer )
 {
@@ -881 +871 @@
 {
     static time_t lastPulseTime = 0;
-    const time_t now = time (NULL);
-    tr_torrent_t * tor;
-
-    if( lastPulseTime + SWIFT_REFRESH_INTERVAL_SEC > now )
-        return;
-    lastPulseTime = now;
-
-    for( tor=h->torrentList; tor; tor=tor->next )
-        tr_torrentSwiftPulse( tor );
-}
+
+    if( lastPulseTime + SWIFT_REFRESH_INTERVAL_SEC <= time( NULL ) )
+    {
+        tr_torrent_t * tor;
+        for( tor=h->torrentList; tor; tor=tor->next )
+            tr_torrentSwiftPulse( tor );
+
+        lastPulseTime = time( NULL );
+    }
+}

trunk/libtransmission/platform.c

@@ -265 +265 @@
 }
 
+void tr_lockLock( tr_lock_t * l )
+{
+#ifdef SYS_BEOS
+    acquire_sem( *l );
+#else
+    pthread_mutex_lock( l );
+#endif
+}
+
+void tr_lockUnlock( tr_lock_t * l )
+{
+#ifdef SYS_BEOS
+    release_sem( *l );
+#else
+    pthread_mutex_unlock( l );
+#endif
+}
+
 
 void tr_condInit( tr_cond_t * c )

trunk/libtransmission/platform.h

@@ -45 +45 @@
 tr_thread_t;
 
-/* only for debugging purposes */
 const char * tr_getHomeDirectory( void );
-
 const char * tr_getCacheDirectory( void );
 const char * tr_getTorrentsDirectory( void );
@@ -62 +60 @@
 void tr_lockInit     ( tr_lock_t * );
 void tr_lockClose    ( tr_lock_t * );
+void tr_lockLock     ( tr_lock_t * );
+void tr_lockUnlock   ( tr_lock_t * );
 
-static inline void tr_lockLock( tr_lock_t * l )
-{
-#ifdef SYS_BEOS
-    acquire_sem( *l );
-#else
-    pthread_mutex_lock( l );
-#endif
-}
-
-static inline void tr_lockUnlock( tr_lock_t * l )
-{
-#ifdef SYS_BEOS
-    release_sem( *l );
-#else
-    pthread_mutex_unlock( l );
-#endif
-}
-
-void tr_condInit( tr_cond_t * );
-void tr_condWait( tr_cond_t *, tr_lock_t * );
-void tr_condSignal( tr_cond_t * );
-void tr_condClose( tr_cond_t * );
+void tr_condInit     ( tr_cond_t * );
+void tr_condWait     ( tr_cond_t *, tr_lock_t * );
+void tr_condSignal   ( tr_cond_t * );
+void tr_condClose    ( tr_cond_t * );
 
 struct in_addr; /* forward declaration to calm gcc down */