Changeset 2152

Timestamp:

Jun 18, 2007, 5:05:16 AM (15 years ago)

Author:

charles

Message:

Fix very large file error reported by Gimp_

Location:

trunk/libtransmission

Files:

• torrent.c (modified) (3 diffs)
• transmission.h (modified) (1 diff)

trunk/libtransmission/torrent.c

@@ -617 +617 @@
 }
 
-size_t
+uint64_t
 tr_torrentFileBytesCompleted ( const tr_torrent_t * tor, int fileIndex )
 {
-    const tr_file_t * file     = &tor->info.files[fileIndex];
-    const int firstBlock       =  file->offset / tor->blockSize;
-    const int firstBlockOffset =  file->offset % tor->blockSize;
-    const int lastOffset       =  file->length ? file->length-1 : 0;
-    const int lastBlock        = (file->offset + lastOffset) / tor->blockSize;
-    const int lastBlockOffset  = (file->offset + lastOffset) % tor->blockSize;
-    size_t haveBytes = 0;
+    const tr_file_t * file     =  &tor->info.files[fileIndex];
+    const uint64_t firstBlock       =  file->offset / tor->blockSize;
+    const uint64_t firstBlockOffset =  file->offset % tor->blockSize;
+    const uint64_t lastOffset       =  file->length ? (file->length-1) : 0;
+    const uint64_t lastBlock        = (file->offset + lastOffset) / tor->blockSize;
+    const uint64_t lastBlockOffset  = (file->offset + lastOffset) % tor->blockSize;
+    uint64_t haveBytes = 0;
 
     assert( tor != NULL );
     assert( 0<=fileIndex && fileIndex<tor->info.fileCount );
     assert( file->offset + file->length <= tor->info.totalSize );
-    assert( 0<=firstBlock && firstBlock<tor->blockCount );
-    assert( 0<=lastBlock && lastBlock<tor->blockCount );
+    assert( (int)firstBlock < tor->blockCount );
+    assert( (int)lastBlock < tor->blockCount );
     assert( firstBlock <= lastBlock );
     assert( tr_blockPiece( firstBlock ) == file->firstPiece );
@@ -644 +644 @@
     else
     {
-        int i;
+        uint64_t i;
 
         if( tr_cpBlockIsComplete( tor->completion, firstBlock ) )
@@ -663 +663 @@
 tr_torrentFileCompletion ( const tr_torrent_t * tor, int fileIndex )
 {
-    const size_t c = tr_torrentFileBytesCompleted ( tor, fileIndex );
-    return (float)c / tor->info.files[fileIndex].length;
+    const uint64_t c = tr_torrentFileBytesCompleted ( tor, fileIndex );
+    return (double)c / tor->info.files[fileIndex].length;
 }
 

trunk/libtransmission/transmission.h

@@ -399 +399 @@
 float tr_torrentFileCompletion( const tr_torrent_t *, int fileIndex );
 
-size_t tr_torrentFileBytesCompleted( const tr_torrent_t *, int fileIndex ); 
+uint64_t tr_torrentFileBytesCompleted( const tr_torrent_t *, int fileIndex );