Changeset 6965

Timestamp:

Oct 27, 2008, 4:27:55 AM (12 years ago)

Author:

charles

Message:

(libT) fold together some redundant sanity tests that were taking up 6.6% in softwareelves' profile

Location:

trunk/libtransmission

Files:

• peer-mgr.c (modified) (1 diff)
• torrent.c (modified) (1 diff)

trunk/libtransmission/peer-mgr.c

@@ -868 +868 @@
         const uint32_t offset = getBlockOffsetInPiece( tor, block );
         const uint32_t length = tr_torBlockCountBytes( tor, block );
-
-        assert( tr_torrentReqIsValid( tor, index, offset, length ) );
-        assert( offset < tr_torPieceCountBytes( tor, index ) );
-        assert( (offset + length) <= tr_torPieceCountBytes( tor, index ) );
 
         /* find a peer who can ask for this block */

trunk/libtransmission/torrent.c

@@ -1556 +1556 @@
     if( index >= tor->info.pieceCount )
         err = 1;
-    else if( offset >= tr_torPieceCountBytes( tor, index ) )
+    else if( ( offset + length ) >= tr_torPieceCountBytes( tor, index ) )
         err = 2;
     else if( length > MAX_BLOCK_SIZE )
         err = 3;
-    else if( tr_pieceOffset( tor, index, offset,
-                             length ) > tor->info.totalSize )
+    else if( tr_pieceOffset( tor, index, offset, length ) > tor->info.totalSize )
         err = 4;