From ead8254b85722da3221aac5dca75be2cd50224c6 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Sat, 3 Jan 2009 23:11:29 +0000 Subject: [PATCH] (trunk libT) tr_torrentStat() speedups --- libtransmission/torrent.c | 2 +- libtransmission/tracker.c | 6 +++--- libtransmission/tracker.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libtransmission/torrent.c b/libtransmission/torrent.c index 336c0daf6..2a2cc38c7 100644 --- a/libtransmission/torrent.c +++ b/libtransmission/torrent.c @@ -738,7 +738,7 @@ tr_torrentStat( tr_torrent * tor ) sizeof( s->errorString ) ); tc = tor->tracker; - ti = tr_trackerGetAddress( tor->tracker ); + ti = tr_trackerGetAddress( tor->tracker, tor ); s->announceURL = ti ? ti->announce : NULL; s->scrapeURL = ti ? ti->scrape : NULL; tr_trackerStat( tc, s ); diff --git a/libtransmission/tracker.c b/libtransmission/tracker.c index 58692fb5c..74323284f 100644 --- a/libtransmission/tracker.c +++ b/libtransmission/tracker.c @@ -156,7 +156,7 @@ getCurrentAddress( tr_tracker * t ) { const tr_torrent * torrent; - if( ( torrent = tr_torrentFindFromHash( t->session, t->hash ) ) ) + if( ( torrent = tr_torrentFindFromId( t->session, t->torrentId ) ) ) return getCurrentAddressFromTorrent( t, torrent ); return NULL; } @@ -1108,9 +1108,9 @@ tr_trackerUnsubscribe( tr_tracker * t, } const tr_tracker_info * -tr_trackerGetAddress( tr_tracker * t ) +tr_trackerGetAddress( tr_tracker * t, const tr_torrent * torrent ) { - return getCurrentAddress( t ); + return getCurrentAddressFromTorrent( t, torrent ); } time_t diff --git a/libtransmission/tracker.h b/libtransmission/tracker.h index e7d5b00e4..f9d11b20c 100644 --- a/libtransmission/tracker.h +++ b/libtransmission/tracker.h @@ -85,7 +85,7 @@ void tr_trackerReannounce( struct tr_tracker * ); void tr_trackerChangeMyPort( struct tr_tracker * ); -const tr_tracker_info * tr_trackerGetAddress( struct tr_tracker * ); +const tr_tracker_info * tr_trackerGetAddress( struct tr_tracker *, const tr_torrent * tor ); int tr_trackerCanManualAnnounce( const struct tr_tracker * ); -- 2.40.0