Changeset 1912

Timestamp:

May 23, 2007, 4:45:20 AM (14 years ago)

Author:

joshe

Message:

Remove tr_handle_t argument from tr_torrentClose().

Location:

trunk

Files:

• beos/TRWindow.cpp (modified) (1 diff)
• cli/transmissioncli.c (modified) (1 diff)
• daemon/torrents.c (modified) (2 diffs)
• gtk/tr_torrent.c (modified) (1 diff)
• libtransmission/torrent.c (modified) (1 diff)
• libtransmission/transmission.h (modified) (1 diff)
• macosx/Controller.m (modified) (4 diffs)
• macosx/DragOverlayWindow.m (modified) (1 diff)
• macosx/Torrent.m (modified) (1 diff)

trunk/beos/TRWindow.cpp

@@ -312 +312 @@
                 // Remove the file from the filesystem.
                 TRTransfer *item = (TRTransfer*)transfers->RemoveItem(index);
-                tr_torrentClose(engine, item->GetTorrent());
+                tr_torrentClose(item->GetTorrent());
                 BEntry *entry = new BEntry(item->GetCachedPath(), true);
                 entry->Remove();

trunk/cli/transmissioncli.c

@@ -284 +284 @@
     
 cleanup:
-    tr_torrentClose( h, tor );
+    tr_torrentClose( tor );
     tr_close( h );
 

trunk/daemon/torrents.c

@@ -643 +643 @@
         if( TR_STATUS_PAUSE & st->status )
         {
-            tr_torrentClose( gl_handle, tor->tor );
+            tr_torrentClose( tor->tor );
             RB_REMOVE( tortree, &gl_tree, tor );
             RB_REMOVE( hashtree, &gl_hashes, tor );
@@ -674 +674 @@
             {
                 next = RB_NEXT( tortree, &gl_tree, tor );
-                tr_torrentClose( gl_handle, tor->tor );
+                tr_torrentClose( tor->tor );
                 RB_REMOVE( tortree, &gl_tree, tor );
                 RB_REMOVE( hashtree, &gl_hashes, tor );

trunk/gtk/tr_torrent.c

@@ -239 +239 @@
     if(!tr_torrent_paused(self))
       tr_torrentStop(self->handle);
-    tr_torrentClose( tr_core_handle( TR_CORE( self->core) ) , self->handle );
+    tr_torrentClose( self->handle );
     self->handle = NULL;
   }

trunk/libtransmission/torrent.c

@@ -664 +664 @@
  * Frees memory allocated by tr_torrentInit.
  **********************************************************************/
-void tr_torrentClose( tr_handle_t * h, tr_torrent_t * tor )
-{
+void tr_torrentClose( tr_torrent_t * tor )
+{
+    tr_handle_t * h = tor->handle;
     tr_info_t * inf = &tor->info;
 

trunk/libtransmission/transmission.h

@@ -368 +368 @@
  * you must call tr_torrentStop() before closing it.
  **********************************************************************/
-void tr_torrentClose( tr_handle_t *, tr_torrent_t * );
+void tr_torrentClose( tr_torrent_t * );
 
 /***********************************************************************

trunk/macosx/Controller.m

@@ -783 +783 @@
     [torrentPath release];
 
-    tr_torrentClose(fLib, tempTor);
+    tr_torrentClose(tempTor);
     [panel beginSheetForDirectory: nil file: nil types: nil modalForWindow: fWindow modalDelegate: self
             didEndSelector: @selector(folderChoiceClosed:returnCode:contextInfo:) contextInfo: dictionary];
@@ -1972 +1972 @@
         
         if (tempTor)
-            tr_torrentClose(fLib, tempTor);
+            tr_torrentClose(tempTor);
         else if (error != TR_EUNSUPPORTED && error != TR_EDUPLICATE)
             [fAutoImportedNames removeObject: [file lastPathComponent]]; //can try to import later
@@ -2102 +2102 @@
             if ((tempTor = tr_torrentInit(fLib, [file UTF8String], NULL, 0, &error)))
             {
-                tr_torrentClose(fLib, tempTor);
+                tr_torrentClose(tempTor);
                 
                 [fOverlayWindow setFiles: files];
@@ -2143 +2143 @@
             if ((tempTor = tr_torrentInit(fLib, [file UTF8String], NULL, 0, &error)))
             {
-                tr_torrentClose(fLib, tempTor);
+                tr_torrentClose(tempTor);
                 [filesToOpen addObject: file];
             }

trunk/macosx/DragOverlayWindow.m

@@ -99 +99 @@
             }
             
-            tr_torrentClose(fLib, tempTor);
+            tr_torrentClose(tempTor);
         }
     }

trunk/macosx/Torrent.m

@@ -184 +184 @@
     if (fHandle)
     {
-        tr_torrentClose(fLib, fHandle);
+        tr_torrentClose(fHandle);
         
         if (fDownloadFolder)