Changeset 5645

Timestamp:

Apr 18, 2008, 11:17:40 PM (14 years ago)

Author:

charles

Message:

minor code cleanup: remove dead code, const-correctness, etc

Location:

trunk/libtransmission

Files:

• inout.c (modified) (10 diffs)
• inout.h (modified) (2 diffs)
• platform.c (modified) (3 diffs)
• platform.h (modified) (1 diff)
• resume.c (modified) (3 diffs)

trunk/libtransmission/inout.c

@@ -69 +69 @@
     if ((ioMode==TR_IO_READ) && !fileExists ) /* does file exist? */
         err = tr_ioErrorFromErrno( errno );
-    else if ((fd = tr_fdFileCheckout ( tor->destination, file->name, ioMode==TR_IO_WRITE )) < 0)
+    else if ((fd = tr_fdFileCheckout ( tor->destination,
+                                       file->name,
+                                       ioMode==TR_IO_WRITE )) < 0)
         err = fd;
     else if( lseek( fd, (off_t)fileOffset, SEEK_SET ) == ((off_t)-1) )
@@ -87 +89 @@
 }
 
-static tr_errno
+static void
 findFileLocation( const tr_torrent * tor,
                   tr_piece_index_t   pieceIndex,
@@ -110 +112 @@
         size_t half = len / 2;
         size_t middle = first + half;
-        if( inf->files[middle].offset + inf->files[middle].length < offset ) {
+        if( inf->files[middle].offset + inf->files[middle].length < offset )
+        {
             first = middle;
             ++first;
@@ -125 +128 @@
     assert( *fileIndex < inf->fileCount );
     assert( *fileOffset < inf->files[first].length );
-    return 0;
 }
 
@@ -162 +164 @@
 
 static tr_errno
-readOrWritePiece( tr_torrent        * tor,
-                  int                 ioMode,
-                  tr_piece_index_t    pieceIndex,
-                  uint32_t            pieceOffset,
-                  uint8_t           * buf,
-                  size_t              buflen )
+readOrWritePiece( const tr_torrent        * tor,
+                  int                       ioMode,
+                  tr_piece_index_t          pieceIndex,
+                  uint32_t                  pieceOffset,
+                  uint8_t                 * buf,
+                  size_t                    buflen )
 {
     tr_errno err = 0;
@@ -174 +176 @@
     const tr_info * info = &tor->info;
 
-    assert( pieceIndex < tor->info.pieceCount );
-    assert( pieceOffset + buflen <= tr_torPieceCountBytes( tor, pieceIndex ) );
-
-    if( !err )
-        err = findFileLocation ( tor, pieceIndex, pieceOffset, &fileIndex, &fileOffset );
+    if( pieceIndex >= tor->info.pieceCount )
+        return TR_ERROR_ASSERT;
+    if( pieceOffset + buflen > tr_torPieceCountBytes( tor, pieceIndex ) )
+        return TR_ERROR_ASSERT;
+
+    findFileLocation ( tor, pieceIndex, pieceOffset,
+                            &fileIndex, &fileOffset );
 
     while( buflen && !err )
@@ -195 +199 @@
         buf += bytesThisPass;
         buflen -= bytesThisPass;
-        fileIndex++;
+        ++fileIndex;
         fileOffset = 0;
     }
@@ -209 +213 @@
            uint8_t           * buf )
 {
-    return readOrWritePiece( (tr_torrent*)tor, TR_IO_READ, pieceIndex, begin, buf, len );
+    return readOrWritePiece( tor, TR_IO_READ, pieceIndex, begin, buf, len );
 }
 
 tr_errno
-tr_ioWrite( tr_torrent        * tor,
+tr_ioWrite( const tr_torrent  * tor,
             tr_piece_index_t    pieceIndex,
             uint32_t            begin,
@@ -227 +231 @@
 
 static tr_errno
-tr_ioRecalculateHash( const tr_torrent  * tor,
-                      tr_piece_index_t    pieceIndex,
-                      uint8_t           * setme )
+recalculateHash( const tr_torrent  * tor,
+                 tr_piece_index_t    pieceIndex,
+                 uint8_t           * setme )
 {
     static uint8_t * buf = NULL;
@@ -272 +276 @@
     uint8_t hash[SHA_DIGEST_LENGTH];
 
-    err  = tr_ioRecalculateHash( tor, pieceIndex, hash );
-
-    if( !err && memcmp( hash, tor->info.pieces[pieceIndex].hash, SHA_DIGEST_LENGTH ) )
+    err  = recalculateHash( tor, pieceIndex, hash );
+
+    if( !err && memcmp( hash, tor->info.pieces[pieceIndex].hash,
+                        SHA_DIGEST_LENGTH ) )
         err = TR_ERROR_IO_CHECKSUM;
 

trunk/libtransmission/inout.h

@@ -33 +33 @@
  * or TR_ERROR_IO_* otherwise.
  */
-int tr_ioRead  ( const struct tr_torrent  * tor,
-                 tr_piece_index_t           pieceIndex,
-                 uint32_t                   offset,
-                 uint32_t                   len,
-                 uint8_t                  * setme );
+tr_errno tr_ioRead( const struct tr_torrent  * tor,
+                    tr_piece_index_t           pieceIndex,
+                    uint32_t                   offset,
+                    uint32_t                   len,
+                    uint8_t                  * setme );
 
 /**
@@ -44 +44 @@
  * or TR_ERROR_IO_* otherwise.
  */
-tr_errno tr_ioWrite ( struct tr_torrent  * tor,
-                      tr_piece_index_t     pieceIndex,
-                      uint32_t             offset,
-                      uint32_t             len,
-                      const uint8_t      * writeme );
+tr_errno tr_ioWrite( const struct tr_torrent  * tor,
+                     tr_piece_index_t           pieceIndex,
+                     uint32_t                   offset,
+                     uint32_t                   len,
+                     const uint8_t            * writeme );
 
 /**

trunk/libtransmission/platform.c

@@ -162 +162 @@
 }
     
-void
-tr_threadJoin( tr_thread * t )
-{
-    if( t != NULL )
-    {
-#ifdef __BEOS__
-        long exit;
-        wait_for_thread( t->thread, &exit );
-#elif defined(WIN32)
-        WaitForSingleObject( t->thread_handle, INFINITE );
-        CloseHandle( t->thread_handle );
-#else
-        pthread_join( t->thread, NULL );
-#endif
-
-        tr_dbg( "Thread '%s' joined", t->name );
-        t->name = NULL;
-        t->func = NULL;
-        tr_free( t );
-    }
-}
-
 /***
 ****  LOCKS
@@ -211 +189 @@
     l->lock = create_sem( 1, "" );
 #elif defined(WIN32)
-    InitializeCriticalSection( &l->lock ); /* critical sections support recursion */
+    InitializeCriticalSection( &l->lock ); /* supports recursion */
 #else
     pthread_mutexattr_t attr;
@@ -301 +279 @@
 #else
             struct passwd * pw = getpwuid( getuid() );
-            endpwent( );
             if( pw )
                 home = tr_strdup( pw->pw_dir );
+            endpwent( );
 #endif
         }

trunk/libtransmission/platform.h

@@ -46 +46 @@
 
 tr_thread*   tr_threadNew  ( void (*func)(void *), void * arg, const char * name );
-void         tr_threadJoin ( tr_thread * );
 int          tr_amInThread ( const tr_thread * );
 

trunk/libtransmission/resume.c

@@ -67 +67 @@
                                           tor->info.hash, &pex );
     if( count > 0 )
-        tr_bencInitRaw( tr_bencDictAdd( dict, KEY_PEERS ), pex, sizeof(tr_pex)*count );
+        tr_bencDictAddRaw( dict, KEY_PEERS, pex, sizeof(tr_pex)*count );
     tr_free( pex );
 }
@@ -250 +250 @@
     tr_benc * p;
     tr_benc * m;
-    tr_benc * b;
     const tr_bitfield * bitfield;
 
@@ -267 +266 @@
     /* add the bitfield */
     bitfield = tr_cpBlockBitfield( tor->completion );
-    b = tr_bencDictAdd( p, KEY_PROGRESS_BITFIELD );
-    tr_bencInitRaw( b, bitfield->bits, bitfield->len );
+    tr_bencDictAddRaw( p, KEY_PROGRESS_BITFIELD,
+                       bitfield->bits, bitfield->len );
 
     /* cleanup */