Changeset 5796

Timestamp:

May 10, 2008, 12:19:00 AM (14 years ago)

Author:

charles

Message:

new utility for iterating through torrents: tr_torrentNext()

Location:

trunk/libtransmission

Files:

• port-forwarding.c (modified) (1 diff)
• session.c (modified) (2 diffs)
• torrent.c (modified) (5 diffs)
• torrent.h (modified) (1 diff)
• transmission.h (modified) (1 diff)

trunk/libtransmission/port-forwarding.c

@@ -206 +206 @@
 tr_sharedSetPort( tr_shared * s, int port )
 {
-    tr_torrent * tor;
+    tr_torrent * tor = NULL;
 
     s->publicPort = port;
 
-    for( tor = s->h->torrentList; tor; tor = tor->next )
+    while(( tor = tr_torrentNext( s->h, tor )))
         tr_torrentChangeMyPort( tor );
 }

trunk/libtransmission/session.c

@@ -389 +389 @@
 {
     tr_handle * h = vh;
-    tr_torrent * t;
+    tr_torrent * tor;
 
     tr_sharedShuttingDown( h->shared );
     tr_trackerShuttingDown( h );
 
-    for( t=h->torrentList; t!=NULL; ) {
-        tr_torrent * tmp = t;
-        t = t->next;
-        tr_torrentClose( tmp );
-    }
+    while(( tor = tr_torrentNext( h, NULL )))
+        tr_torrentClose( tor );
 
     tr_peerMgrFree( h->peerMgr );
@@ -683 +680 @@
     }
 }
+
+tr_torrent*
+tr_torrentNext( tr_handle * session, tr_torrent * tor )
+{
+    return tor ? tor->next : session->torrentList;
+}

trunk/libtransmission/torrent.c

@@ -55 +55 @@
 
 int
-tr_torrentExists( tr_handle       * handle,
+tr_torrentExists( const tr_handle * handle,
                   const uint8_t   * torrentHash )
 {
-    return tr_torrentFindFromHash( handle, torrentHash ) != NULL;
+    return tr_torrentFindFromHash( (tr_handle*)handle, torrentHash ) != NULL;
 }
 
@@ -65 +65 @@
                         const uint8_t  * torrentHash )
 {
-    tr_torrent * tor;
-
-    for( tor = handle->torrentList; tor; tor = tor->next )
+    tr_torrent * tor = NULL;
+
+    while(( tor = tr_torrentNext( handle, tor )))
         if( !memcmp( tor->info.hash, torrentHash, SHA_DIGEST_LENGTH ) )
             return tor;
@@ -78 +78 @@
                                   const uint8_t  * obfuscatedTorrentHash )
 {
-    tr_torrent * tor;
-
-    for( tor = handle->torrentList; tor; tor = tor->next )
+    tr_torrent * tor = NULL;
+
+    while(( tor = tr_torrentNext( handle, tor )))
         if( !memcmp( tor->obfuscatedHash, obfuscatedTorrentHash, SHA_DIGEST_LENGTH ) )
             return tor;
@@ -483 +483 @@
 }
 
-static int
-hashExists( const tr_handle   * h,
-            const uint8_t     * hash )
-{
-    const tr_torrent * tor;
-
-    for( tor=h->torrentList; tor; tor=tor->next )
-        if( !memcmp( hash, tor->info.hash, SHA_DIGEST_LENGTH ) )
-            return TRUE;
-
-    return FALSE;
-}
-
 int
 tr_torrentParse( const tr_handle  * handle,
@@ -516 +503 @@
     doFree = !err && ( setmeInfo == &tmp );
 
-    if( !err && hashExists( handle, setmeInfo->hash ) )
+    if( !err && tr_torrentExists( handle, setmeInfo->hash ) )
         err = TR_EDUPLICATE;
 

trunk/libtransmission/torrent.h

@@ -49 +49 @@
 void tr_torrentChangeMyPort  ( tr_torrent * );
 
-int tr_torrentExists( tr_handle *, const uint8_t * );
+int tr_torrentExists( const tr_handle *, const uint8_t * );
 tr_torrent* tr_torrentFindFromHash( tr_handle *, const uint8_t * );
 tr_torrent* tr_torrentFindFromObfuscatedHash( tr_handle *, const uint8_t* );

trunk/libtransmission/transmission.h

@@ -249 +249 @@
 int tr_torrentCount( const tr_handle * h );
 
+/**
+ * Iterate through the torrents.
+ * Pass in in a NULL pointer to get the first torrent.
+ */
+tr_torrent* tr_torrentNext( tr_handle *, tr_torrent * );
+
 /***********************************************************************
 *** Speed Limits