From e1c18610be23a62f8bf3d67c44b7ad0a80540db0 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Tue, 24 Jul 2007 16:04:43 +0000 Subject: [PATCH] remove unused function _tr_blockPosInPiece() --- libtransmission/internal.h | 3 --- libtransmission/torrent.c | 10 +--------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/libtransmission/internal.h b/libtransmission/internal.h index a5e1c0682..51856a49e 100644 --- a/libtransmission/internal.h +++ b/libtransmission/internal.h @@ -127,9 +127,6 @@ int _tr_blockPiece( const tr_torrent_t * tor, int block ); #define tr_blockSize(a) _tr_blockSize(tor,a) int _tr_blockSize( const tr_torrent_t * tor, int block ); -#define tr_blockPosInPiece(a) _tr_blockPosInPiece(tor,a) -int _tr_blockPosInPiece( const tr_torrent_t * tor, int block ); - #define tr_pieceCountBlocks(a) _tr_pieceCountBlocks(tor,a) int _tr_pieceCountBlocks( const tr_torrent_t * tor, int piece ); diff --git a/libtransmission/torrent.c b/libtransmission/torrent.c index b233ce62a..78e44305c 100644 --- a/libtransmission/torrent.c +++ b/libtransmission/torrent.c @@ -1369,8 +1369,7 @@ tr_torrentSetFileDLs ( tr_torrent_t * tor, int _tr_blockPiece( const tr_torrent_t * tor, int block ) { - const tr_info_t * inf = &tor->info; - return block / ( inf->pieceSize / tor->blockSize ); + return (block * tor->blockSize) / tor->info.pieceSize; } int _tr_blockSize( const tr_torrent_t * tor, int block ) @@ -1387,13 +1386,6 @@ int _tr_blockSize( const tr_torrent_t * tor, int block ) return dummy; } -int _tr_blockPosInPiece( const tr_torrent_t * tor, int block ) -{ - const tr_info_t * inf = &tor->info; - return tor->blockSize * - ( block % ( inf->pieceSize / tor->blockSize ) ); -} - int _tr_pieceCountBlocks( const tr_torrent_t * tor, int piece ) { const tr_info_t * inf = &tor->info;