Changeset 2075

Timestamp:

Jun 14, 2007, 10:52:11 AM (15 years ago)

Author:

charles

Message:

fix r2019 off-by-one that caused some complete files to incorrectly show up as 99% in tr_torrentFileCompletion()

Location:

branches/file_selection/libtransmission

Files:

• completion.c (modified) (1 diff)
• torrent.c (modified) (2 diffs)

branches/file_selection/libtransmission/completion.c

@@ -349 +349 @@
     for( i=0; i<info->pieceCount; ++i )
         if( !tr_cpPieceIsComplete( cp, i ) )
-            b += tor->blockSize * (tr_cpCountBlocks( cp, i ) - cp->completeBlocks[ i ] );
-
-    return b;
+            b += ( tr_cpCountBlocks( cp, i ) - cp->completeBlocks[ i ] );
+
+    return b * tor->blockSize;;
 }
 

branches/file_selection/libtransmission/torrent.c

@@ -626 +626 @@
     {
         if( tr_cpBlockIsComplete( tor->completion, firstBlock ) )
-            haveBytes += lastBlockOffset - firstBlockOffset;
+            haveBytes += lastBlockOffset + 1 - firstBlockOffset;
     }
     else
@@ -640 +640 @@
 
         if( tr_cpBlockIsComplete( tor->completion, lastBlock ) )
-            haveBytes += lastBlockOffset;
+            haveBytes += lastBlockOffset + 1;
     }