Changeset 7385 for trunk/libtransmission/torrent.c

Timestamp:

Dec 14, 2008, 11:21:11 AM (12 years ago)

Author:

charles

Message:

(trunk libT) more semantic cleanup: tr_handle->tr_session, int->tr_bool, int->tr_port

File:

• trunk/libtransmission/torrent.c (modified) (19 diffs)

trunk/libtransmission/torrent.c

@@ -61 +61 @@
 
 tr_torrent*
-tr_torrentFindFromId( tr_handle * handle,
-                      int         id )
+tr_torrentFindFromId( tr_session * session, int id )
 {
     tr_torrent * tor = NULL;
 
-    while( ( tor = tr_torrentNext( handle, tor ) ) )
+    while( ( tor = tr_torrentNext( session, tor ) ) )
         if( tor->uniqueId == id )
             return tor;
@@ -74 +73 @@
 
 tr_torrent*
-tr_torrentFindFromHashString( tr_handle *  handle,
-                              const char * str )
+tr_torrentFindFromHashString( tr_session *  session, const char * str )
 {
     tr_torrent * tor = NULL;
 
-    while( ( tor = tr_torrentNext( handle, tor ) ) )
+    while( ( tor = tr_torrentNext( session, tor ) ) )
         if( !strcmp( str, tor->info.hashString ) )
             return tor;
@@ -87 +85 @@
 
 tr_bool
-tr_torrentExists( const tr_handle * handle,
-                  const uint8_t *   torrentHash )
-{
-    return tr_torrentFindFromHash( (tr_handle*)handle,
-                                  torrentHash ) != NULL;
+tr_torrentExists( const tr_session * session, const uint8_t *   torrentHash )
+{
+    return tr_torrentFindFromHash( (tr_session*)session, torrentHash ) != NULL;
 }
 
 tr_torrent*
-tr_torrentFindFromHash( tr_handle *     handle,
-                        const uint8_t * torrentHash )
+tr_torrentFindFromHash( tr_session * session, const uint8_t * torrentHash )
 {
     tr_torrent * tor = NULL;
 
-    while( ( tor = tr_torrentNext( handle, tor ) ) )
+    while( ( tor = tr_torrentNext( session, tor ) ) )
         if( *tor->info.hash == *torrentHash )
             if( !memcmp( tor->info.hash, torrentHash, SHA_DIGEST_LENGTH ) )
@@ -109 +104 @@
 
 tr_torrent*
-tr_torrentFindFromObfuscatedHash( tr_handle *     handle,
+tr_torrentFindFromObfuscatedHash( tr_session * session,
                                   const uint8_t * obfuscatedTorrentHash )
 {
     tr_torrent * tor = NULL;
 
-    while( ( tor = tr_torrentNext( handle, tor ) ) )
+    while( ( tor = tr_torrentNext( session, tor ) ) )
         if( !memcmp( tor->obfuscatedHash, obfuscatedTorrentHash,
                      SHA_DIGEST_LENGTH ) )
@@ -467 +462 @@
 
 static void
-torrentRealInit( tr_handle *     h,
-                 tr_torrent *    tor,
-                 const tr_ctor * ctor )
+torrentRealInit( tr_session      * session,
+                 tr_torrent      * tor,
+                 const tr_ctor   * ctor )
 {
     int        doStart;
@@ -477 +472 @@
     static int nextUniqueId = 1;
 
-    tr_globalLock( h );
-
-    tor->session   = h;
+    tr_globalLock( session );
+
+    tor->session   = session;
     tor->uniqueId = nextUniqueId++;
 
     randomizeTiers( info );
 
-    tor->bandwidth = tr_bandwidthNew( h, h->bandwidth );
+    tor->bandwidth = tr_bandwidthNew( session, session->bandwidth );
 
     tor->blockSize = getBlockSize( info->pieceSize );
@@ -532 +527 @@
              NULL );
 
-    tr_peerMgrAddTorrent( h->peerMgr, tor );
-
-    assert( h->isPortSet );
-
+    tr_peerMgrAddTorrent( session->peerMgr, tor );
+
+    assert( session->isPortSet );
     assert( !tor->downloadedCur );
     assert( !tor->uploadedCur );
@@ -570 +564 @@
         tr_torrent * it = NULL;
         tr_torrent * last = NULL;
-        while( ( it = tr_torrentNext( h, it ) ) )
+        while( ( it = tr_torrentNext( session, it ) ) )
             last = it;
 
         if( !last )
-            h->torrentList = tor;
+            session->torrentList = tor;
         else
             last->next = tor;
-        ++h->torrentCount;
-    }
-
-    tr_globalUnlock( h );
+        ++session->torrentCount;
+    }
+
+    tr_globalUnlock( session );
 
     /* maybe save our own copy of the metainfo */
@@ -595 +589 @@
     }
 
-    tr_metainfoMigrate( h, &tor->info );
+    tr_metainfoMigrate( session, &tor->info );
 
     if( doStart )
@@ -602 +596 @@
 
 int
-tr_torrentParse( const tr_handle * handle,
-                 const tr_ctor *   ctor,
-                 tr_info *         setmeInfo )
+tr_torrentParse( const tr_session  * session,
+                 const tr_ctor     * ctor,
+                 tr_info           * setmeInfo )
 {
     int             err = 0;
@@ -618 +612 @@
         return TR_EINVALID;
 
-    err = tr_metainfoParse( handle, setmeInfo, metainfo );
+    err = tr_metainfoParse( session, setmeInfo, metainfo );
     doFree = !err && ( setmeInfo == &tmp );
 
@@ -624 +618 @@
         err = TR_EINVALID;
 
-    if( !err && tr_torrentExists( handle, setmeInfo->hash ) )
+    if( !err && tr_torrentExists( session, setmeInfo->hash ) )
         err = TR_EDUPLICATE;
 
@@ -634 +628 @@
 
 tr_torrent *
-tr_torrentNew( tr_handle *     handle,
-               const tr_ctor * ctor,
-               int *           setmeError )
+tr_torrentNew( tr_session     * session,
+               const tr_ctor  * ctor,
+               int            * setmeError )
 {
     int          err;
@@ -642 +636 @@
     tr_torrent * tor = NULL;
 
-    err = tr_torrentParse( handle, ctor, &tmpInfo );
+    err = tr_torrentParse( session, ctor, &tmpInfo );
     if( !err )
     {
         tor = tr_new0( tr_torrent, 1 );
         tor->info = tmpInfo;
-        torrentRealInit( handle, tor, ctor );
+        torrentRealInit( session, tor, ctor );
     }
     else if( setmeError )
@@ -1049 +1043 @@
 {
     tr_torrent * t;
-    tr_handle *  h = tor->session;
+    tr_session *  session = tor->session;
     tr_info *    inf = &tor->info;
 
@@ -1055 +1049 @@
     assert( !tor->isRunning );
 
-    tr_globalLock( h );
-
-    tr_peerMgrRemoveTorrent( h->peerMgr, tor->info.hash );
+    tr_globalLock( session );
+
+    tr_peerMgrRemoveTorrent( session->peerMgr, tor->info.hash );
 
     tr_cpClose( tor->completion );
@@ -1072 +1066 @@
     tr_free( tor->peer_id );
 
-    if( tor == h->torrentList )
-        h->torrentList = tor->next;
-    else for( t = h->torrentList; t != NULL; t = t->next )
-        {
-            if( t->next == tor )
-            {
-                t->next = tor->next;
-                break;
-            }
+    if( tor == session->torrentList )
+        session->torrentList = tor->next;
+    else for( t = session->torrentList; t != NULL; t = t->next ) {
+        if( t->next == tor ) {
+            t->next = tor->next;
+            break;
         }
-
-    assert( h->torrentCount >= 1 );
-    h->torrentCount--;
+    }
+
+    assert( session->torrentCount >= 1 );
+    session->torrentCount--;
 
     tr_bandwidthFree( tor->bandwidth );
@@ -1091 +1083 @@
     tr_free( tor );
 
-    tr_globalUnlock( h );
+    tr_globalUnlock( session );
 }
 
@@ -1249 +1241 @@
     if( tor )
     {
-        tr_handle * handle = tor->session;
-        tr_globalLock( handle );
+        tr_session * session = tor->session;
+        tr_globalLock( session );
 
         tr_torrentClearCompletenessCallback( tor );
-        tr_runInEventThread( handle, closeTorrent, tor );
-
-        tr_globalUnlock( handle );
+        tr_runInEventThread( session, closeTorrent, tor );
+
+        tr_globalUnlock( session );
     }
 }