Changeset 2069

Timestamp:

Jun 13, 2007, 5:25:55 PM (15 years ago)

Author:

charles

Message:

assertions for floam

Location:

branches/file_selection/libtransmission

Files:

• completion.c (modified) (12 diffs)
• peer.c (modified) (1 diff)

branches/file_selection/libtransmission/completion.c

@@ -162 +162 @@
 void tr_cpDownloaderRem( tr_completion_t * cp, int block )
 {
-    tr_torrent_t * tor = cp->tor;
+    tr_torrent_t * tor;
+
+    assert( cp != NULL );
+    assert( cp->tor != NULL );
+    assert( 0 <= block );
+
+    tor = cp->tor;
     (cp->blockDownloaders[block])--;
     if( !cp->blockDownloaders[block] && !tr_cpBlockIsComplete( cp, block ) )
@@ -172 +178 @@
 int tr_cpBlockIsComplete( const tr_completion_t * cp, int block )
 {
+    assert( cp != NULL );
+    assert( 0 <= block );
+
     return tr_bitfieldHas( cp->blockBitfield, block );
 }
@@ -177 +186 @@
 void tr_cpBlockAdd( tr_completion_t * cp, int block )
 {
-    const tr_torrent_t * tor = cp->tor;
+    const tr_torrent_t * tor;
+
+    assert( cp != NULL );
+    assert( cp->tor != NULL );
+    assert( 0 <= block );
+
+    tor = cp->tor;
 
     if( !tr_cpBlockIsComplete( cp, block ) )
@@ -196 +211 @@
 const tr_bitfield_t * tr_cpBlockBitfield( const tr_completion_t * cp )
 {
+    assert( cp != NULL );
+
     return cp->blockBitfield;
 }
@@ -203 +220 @@
 {
     int i;
-    tr_torrent_t * tor = cp->tor;
+
+    assert( cp != NULL );
+    assert( bitfield != NULL );
 
     tr_cpReset( cp );
-    cp->tor = tor;
 
     for( i=0; i < cp->tor->blockCount; ++i )
@@ -215 +233 @@
 float tr_cpPercentBlocksInPiece( const tr_completion_t * cp, int piece )
 {
+    assert( cp != NULL );
+
     return cp->completeBlocks[piece] / (double)tr_cpCountBlocks( cp, piece );
 }
@@ -283 +303 @@
 tr_cpMissingBlocksForPiece( const tr_completion_t * cp, int piece )
 {
+    assert( cp != NULL );
+
     return cp->missingBlocks[piece];
 }
@@ -296 +318 @@
     int i;
     int ret = CP_COMPLETE;
-    const tr_info_t * info = &cp->tor->info;
-
+    const tr_info_t * info;
+
+    assert( cp != NULL );
+    assert( cp->tor != NULL );
+
+    info = &cp->tor->info;
     for( i=0; i<info->pieceCount; ++i ) {
         if( tr_cpPieceIsComplete( cp, i ) )
@@ -314 +340 @@
     int i;
     uint64_t b=0;
-    const tr_torrent_t * tor = cp->tor;
-    const tr_info_t * info = &tor->info;
-
+    const tr_torrent_t * tor;
+    const tr_info_t * info;
+
+    assert( cp != NULL );
+    assert( cp->tor != NULL );
+
+    tor = cp->tor;
+    info = &tor->info;
     for( i=0; i<info->pieceCount; ++i )
         if( !tr_cpPieceIsComplete( cp, i ) )
@@ -329 +360 @@
     int i;
     uint64_t b=0;
-    const tr_torrent_t * tor = cp->tor;
-    const tr_info_t * info = &tor->info;
+    const tr_torrent_t * tor;
+    const tr_info_t * info;
+
+    assert( cp != NULL );
+    assert( cp->tor != NULL );
+
+    tor = cp->tor;
+    info = &tor->info;
 
     for( i=0; i<info->pieceCount; ++i )
@@ -344 +381 @@
     int i;
     uint64_t have=0;
-    const tr_torrent_t * tor = cp->tor;
-
+    const tr_torrent_t * tor;
+
+    assert( cp != NULL );
+    assert( cp->tor != NULL );
+
+    tor = cp->tor;
     for( i=0; i<tor->info.pieceCount; ++i )
         have += cp->completeBlocks[ i ];
@@ -357 +398 @@
     int i;
     uint64_t have=0, total=0;
-    const tr_torrent_t * tor = cp->tor;
+    const tr_torrent_t * tor;
+
+    assert( cp != NULL );
+    assert( cp->tor != NULL );
+
+    tor = cp->tor;
 
     for( i=0; i<tor->info.pieceCount; ++i ) {

branches/file_selection/libtransmission/peer.c

@@ -575 +575 @@
 
         /* TODO: add some asserts to see if this bitfield is really necessary */
-        tr_bitfield_t * blocksAlreadyRequested = tr_bitfieldNew( tor->info.blockCount );
+        tr_bitfield_t * blocksAlreadyRequested = tr_bitfieldNew( tor->blockCount );
         for( i=0; i<peer->inRequestCount; ++i) {
             const tr_request_t * r = &peer->inRequests[i];