Changeset 11825 for trunk/libtransmission/torrent.c

Timestamp:

Feb 3, 2011, 10:53:02 PM (11 years ago)

Author:

jordan

Message:

(trunk libT) minor futzing: remove unnecessary "assert( tr_isTorrent( tor ) );" calls

Remove these calls from private functions whose callers have already asserted the same thing.

File:

• trunk/libtransmission/torrent.c (modified) (11 diffs)

trunk/libtransmission/torrent.c

@@ -485 +485 @@
 tr_torrentClearError( tr_torrent * tor )
 {
-    assert( tr_isTorrent( tor ) );
-
     tor->error = TR_STAT_OK;
     tor->errorString[0] = '\0';
@@ -1482 +1480 @@
 tr_torrentResetTransferStats( tr_torrent * tor )
 {
-    assert( tr_isTorrent( tor ) );
-
     tr_torrentLock( tor );
 
@@ -1523 +1519 @@
     tr_info *    inf = &tor->info;
 
-    assert( tr_isTorrent( tor ) );
     assert( !tor->isRunning );
 
@@ -1616 +1611 @@
 torrentStart( tr_torrent * tor )
 {
-    assert( tr_isTorrent( tor ) );
-
     /* already running... */
     if( tor->isRunning )
@@ -1690 +1683 @@
     tr_torrent * tor = vtor;
 
-    assert( tr_isTorrent( tor ) );
     tr_sessionLock( tor->session );
 
@@ -1883 +1875 @@
                         tr_bool            wasRunning )
 {
-    assert( tr_isTorrent( tor ) );
     assert( ( status == TR_LEECH )
          || ( status == TR_SEED )
@@ -1955 +1946 @@
     char timeStr[128];
     const time_t now = tr_time( );
-
-    assert( tr_isTorrent( tor ) );
 
     tr_strlcpy( timeStr, ctime( &now ), sizeof( timeStr ) );
@@ -2142 +2131 @@
 setFileDND( tr_torrent * tor, tr_file_index_t fileIndex, int doDownload )
 {
-    tr_file *        file;
     const int8_t     dnd = !doDownload;
     tr_piece_index_t firstPiece;
@@ -2149 +2137 @@
     int8_t           lastPieceDND;
     tr_file_index_t  i;
-
-    assert( tr_isTorrent( tor ) );
-
-    file = &tor->info.files[fileIndex];
+    tr_file *        file = &tor->info.files[fileIndex];
+
     file->dnd = dnd;
     firstPiece = file->firstPiece;
@@ -2673 +2659 @@
                tr_ptrArray      * dirtyFolders )
 {
-    int i;
     struct stat sb;
-    char * buf;
-
-    assert( tr_isTorrent( tor ) );
-
-    buf = tr_buildPath( dir, base, NULL );
-    i = stat( buf, &sb );
+    char * buf = tr_buildPath( dir, base, NULL );
+    int i = stat( buf, &sb );
+
     if( !i )
     {
@@ -2729 +2711 @@
     char * root = tr_buildPath( tor->currentDir, tmp, NULL );
 
-    assert( tr_isTorrent( tor ) );
-
     for( f=0; f<tor->info.fileCount; ++f ) {
         tr_ptrArrayInsertSorted( &torrentFiles, tr_strdup( tor->info.files[f].name ), vstrcmp );