Changeset 5880

Timestamp:

May 21, 2008, 5:14:58 PM (14 years ago)

Author:

charles

Message:

rename tr_torrentClose() as tr_torrentFree() and make it private. change client code to use tr_torrentRemove() instead. This fixes the confusion between the two methods that led to #954

Location:

trunk

Files:

• beos/TRWindow.cpp (modified) (2 diffs)
• cli/transmissioncli.c (modified) (1 diff)
• doc/rpc-spec.txt (modified) (1 diff)
• gtk/tr-torrent.c (modified) (1 diff)
• libtransmission/rpc.c (modified) (2 diffs)
• libtransmission/session.c (modified) (1 diff)
• libtransmission/torrent.c (modified) (2 diffs)
• libtransmission/transmission.h (modified) (1 diff)
• wx/xmission.cc (modified) (1 diff)

trunk/beos/TRWindow.cpp

@@ -120 +120 @@
 }
 
-static void torrentclose(tr_torrent_t *torrent, void *)
-{
-        tr_torrentClose(torrent);
-}
-
 TRWindow::~TRWindow() {
-        tr_torrentIterate(engine, torrentclose, NULL);
         const int MAX_EXIT_WAIT_SECS = 10;
         const time_t deadline = time(0) + MAX_EXIT_WAIT_SECS;
@@ -354 +348 @@
                 // Remove the file from the filesystem.
                 TRTransfer *item = (TRTransfer*)transfers->RemoveItem(index);
-                tr_torrentClose(item->GetTorrent());
+                tr_torrentRemove(item->GetTorrent());
                 BEntry *entry = new BEntry(item->GetCachedPath(), true);
                 entry->Remove();

trunk/cli/transmissioncli.c

@@ -374 +374 @@
     
 cleanup:
-    tr_torrentClose( tor );
     tr_sessionClose( h );
 

trunk/doc/rpc-spec.txt

@@ -66 +66 @@
    Method name         | libtransmission function
    --------------------+-------------------------------------------------
-   "torrent-close"     | tr_torrentClose
    "torrent-remove"    | tr_torrentRemove
    "torrent-start"     | tr_torrentStart

trunk/gtk/tr-torrent.c

@@ -82 +82 @@
                 tr_torrentRemove( self->priv->handle );
             else
-                tr_torrentClose( self->priv->handle );
+                tr_torrentFree( self->priv->handle );
         }
 

trunk/libtransmission/rpc.c

@@ -116 +116 @@
         tr_torrentStop( tor );
         notify( h, TR_RPC_TORRENT_STOPPED, tor );
-    }
-    tr_free( torrents );
-    return NULL;
-}
-
-static const char*
-torrentClose( tr_handle * h, tr_benc * args_in, tr_benc * args_out UNUSED )
-{
-    int i, torrentCount;
-    tr_torrent ** torrents = getTorrents( h, args_in, &torrentCount );
-    for( i=0; i<torrentCount; ++i )
-    {
-        tr_torrent * tor = torrents[i];
-        notify( h, TR_RPC_TORRENT_CLOSING, tor );
-        tr_torrentClose( tor );
     }
     tr_free( torrents );
@@ -684 +669 @@
     { "session-set", sessionSet },
     { "torrent-add", torrentAdd },
-    { "torrent-close", torrentClose },
     { "torrent-get-priorities", torrentGetPriorities },
     { "torrent-get", torrentGet },

trunk/libtransmission/session.c

@@ -426 +426 @@
 
     while(( tor = tr_torrentNext( h, NULL )))
-        tr_torrentClose( tor );
+        tr_torrentFree( tor );
 
     tr_peerMgrFree( h->peerMgr );

trunk/libtransmission/torrent.c

@@ -1119 +1119 @@
 
 void
-tr_torrentClose( tr_torrent * tor )
+tr_torrentFree( tr_torrent * tor )
 {
     if( tor != NULL )
@@ -1137 +1137 @@
 {
     tor->isDeleting = 1;
-    tr_torrentClose( tor );
+    tr_torrentFree( tor );
 }
 

trunk/libtransmission/transmission.h

@@ -744 +744 @@
  * Running torrents are stopped first.
  */
-void tr_torrentClose( tr_torrent * );
-
-/**
- * Like tr_torrentClose() but also deletes
- * the resume file and our copy of the
- * torrent file
+void tr_torrentFree( tr_torrent * );
+
+/**
+ * Removes our .torrent and .resume files for this
+ * torrent, then calls tr_torrentFree()
  */
 void tr_torrentRemove( tr_torrent * );

trunk/wx/xmission.cc

@@ -328 +328 @@
 MyFrame :: OnRemove( wxCommandEvent& WXUNUSED(unused) )
 {
-    foreach( torrents_v, mySelectedTorrents, it ) {
-        tr_torrentRemoveSaved( *it );
-        tr_torrentClose( *it );
-    }
+    foreach( torrents_v, mySelectedTorrents, it )
+        tr_torrentRemove( *it );
 }