(trivial) make the implementation of tr_torPieceCountBlocks(), tr_torPieceCountBytes...

diff --git a/libtransmission/torrent.h b/libtransmission/torrent.h
index 946f1b493a49e6500a496b37451f242be8cf4b14..c49b574a4eed298b2a8336591f56bec026223f8b 100644 (file)
--- a/libtransmission/torrent.h
+++ b/libtransmission/torrent.h
@@ -273,17 +273,15 @@ tr_torBlockPiece( const tr_torrent * tor, const tr_block_index_t block )
 static inline uint16_t
 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;
 }
 
 /* how many bytes are in this piece? */
 static inline uint32_t
 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;
 }
 
@@ -291,7 +289,7 @@ tr_torPieceCountBytes( const tr_torrent * tor, const tr_piece_index_t piece )
 static inline uint32_t
 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;
 }