Changeset 2362 for trunk/libtransmission/torrent.c

Timestamp:

Jul 15, 2007, 8:29:57 PM (15 years ago)

Author:

charles

Message:

remove more functions made obsolete by tr_torrentFile().

File:

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

trunk/libtransmission/torrent.c

@@ -635 +635 @@
 ***/
 
+static uint64_t
+fileBytesCompleted ( const tr_torrent_t * tor, int fileIndex )
+{
+    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( (int)firstBlock < tor->blockCount );
+    assert( (int)lastBlock < tor->blockCount );
+    assert( firstBlock <= lastBlock );
+    assert( tr_blockPiece( firstBlock ) == file->firstPiece );
+    assert( tr_blockPiece( lastBlock ) == file->lastPiece );
+
+    if( firstBlock == lastBlock )
+    {
+        if( tr_cpBlockIsComplete( tor->completion, firstBlock ) )
+            haveBytes += lastBlockOffset + 1 - firstBlockOffset;
+    }
+    else
+    {
+        uint64_t i;
+
+        if( tr_cpBlockIsComplete( tor->completion, firstBlock ) )
+            haveBytes += tor->blockSize - firstBlockOffset;
+
+        for( i=firstBlock+1; i<lastBlock; ++i )
+            if( tr_cpBlockIsComplete( tor->completion, i ) )
+               haveBytes += tor->blockSize;
+
+        if( tr_cpBlockIsComplete( tor->completion, lastBlock ) )
+            haveBytes += lastBlockOffset + 1;
+    }
+
+    return haveBytes;
+}
+
 tr_file_stat_t *
 tr_torrentFiles( const tr_torrent_t * tor, int * fileCount )
@@ -648 +691 @@
         cp_status_t cp;
 
-        walk->bytesCompleted = tr_torrentFileBytesCompleted( tor, i );
-
-        walk->progress = walk->bytesCompleted / (float)length;
+        walk->bytesCompleted = fileBytesCompleted( tor, i );
+
+        walk->progress = length
+            ? walk->bytesCompleted / (float)length
+            : 1.0;
 
         if( walk->bytesCompleted >= length )
@@ -756 +801 @@
 
     tr_torrentReaderUnlock( tor );
-}
-
-uint64_t
-tr_torrentFileBytesCompleted ( const tr_torrent_t * tor, int fileIndex )
-{
-    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( (int)firstBlock < tor->blockCount );
-    assert( (int)lastBlock < tor->blockCount );
-    assert( firstBlock <= lastBlock );
-    assert( tr_blockPiece( firstBlock ) == file->firstPiece );
-    assert( tr_blockPiece( lastBlock ) == file->lastPiece );
-
-    if( firstBlock == lastBlock )
-    {
-        if( tr_cpBlockIsComplete( tor->completion, firstBlock ) )
-            haveBytes += lastBlockOffset + 1 - firstBlockOffset;
-    }
-    else
-    {
-        uint64_t i;
-
-        if( tr_cpBlockIsComplete( tor->completion, firstBlock ) )
-            haveBytes += tor->blockSize - firstBlockOffset;
-
-        for( i=firstBlock+1; i<lastBlock; ++i )
-            if( tr_cpBlockIsComplete( tor->completion, i ) )
-               haveBytes += tor->blockSize;
-
-        if( tr_cpBlockIsComplete( tor->completion, lastBlock ) )
-            haveBytes += lastBlockOffset + 1;
-    }
-
-    return haveBytes;
-}
-
-float
-tr_torrentFileCompletion ( const tr_torrent_t * tor, int fileIndex )
-{
-    const uint64_t c = tr_torrentFileBytesCompleted ( tor, fileIndex );
-    uint64_t length = tor->info.files[fileIndex].length;
-    
-    if( !length )
-        return 1.0;
-    return (double)c / length;
-}
-
-float*
-tr_torrentCompletion( const tr_torrent_t * tor )
-{
-    int i;
-    float * f;
-    tr_torrentReaderLock( tor );
-
-    f = tr_new0( float, tor->info.fileCount );
-    for( i=0; i<tor->info.fileCount; ++i )
-       f[i] = tr_torrentFileCompletion ( tor, i );
-
-    tr_torrentReaderUnlock( tor );
-    return f;
 }