Changeset 11807

Timestamp:

Feb 1, 2011, 9:32:03 PM (12 years ago)

Author:

jordan

Message:

(trivial) make the implementation of tr_torPieceCountBlocks(), tr_torPieceCountBytes(), and tr_torBlockCountBytes() consistent.

File:

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

trunk/libtransmission/torrent.h

@@ -274 +274 @@
 tr_torPieceCountBlocks( const tr_torrent * tor, const tr_piece_index_t piece )
 {
-    if( piece + 1 == tor->info.pieceCount )
-        return tor->blockCountInLastPiece;
-    else
-        return tor->blockCountInPiece;
+    return piece + 1 == tor->info.pieceCount ? tor->blockCountInLastPiece
+                                             : tor->blockCountInPiece;
 }
 
@@ -284 +282 @@
 tr_torPieceCountBytes( const tr_torrent * tor, const tr_piece_index_t piece )
 {
-    return piece == tor->info.pieceCount - 1 ? tor->lastPieceSize
+    return piece + 1 == tor->info.pieceCount ? tor->lastPieceSize
                                              : tor->info.pieceSize;
 }
@@ -292 +290 @@
 tr_torBlockCountBytes( const tr_torrent * tor, const tr_block_index_t block )
 {
-    return block == tor->blockCount - 1 ? tor->lastBlockSize
+    return block + 1 == tor->blockCount ? tor->lastBlockSize
                                         : tor->blockSize;
 }