(trunk libT) tr_torrentStat() speedups

diff --git a/libtransmission/torrent.c b/libtransmission/torrent.c
index 336c0daf6dae299b897c0abd1ee1f1d0da4f14f0..2a2cc38c7efb18914825baff0ebb895e37c3195e 100644 (file)
--- 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 58692fb5c8f466b4fad139246a0989fa07780eab..74323284f94b0ea449ce0496538a9e3a2569157e 100644 (file)
--- 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 e7d5b00e47850de83e0767265c3a2990f2e37658..f9d11b20c9092b88154bac0a3f67b1361fd58180 100644 (file)
--- 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 * );