Changeset 3486

Timestamp:

Oct 20, 2007, 10:07:21 PM (15 years ago)

Author:

charles

Message:

remove dead code (TR_STATUS_ACTIVE, TR_STATUS_INACTIVE)

Location:

trunk

Files:

• cli/transmissioncli.c (modified) (1 diff)
• daemon/torrents.c (modified) (3 diffs)
• gtk/main.c (modified) (1 diff)
• libtransmission/ipcparse.c (modified) (2 diffs)
• libtransmission/transmission.h (modified) (1 diff)

trunk/cli/transmissioncli.c

@@ -314 +314 @@
                 s->rateUpload, getStringRatio(s->ratio) );
         }
-        else if( s->status & TR_STATUS_INACTIVE )
+        else if( s->status & TR_STATUS_STOPPED )
         {
             break;

trunk/daemon/torrents.c

@@ -188 +188 @@
         const tr_stat  * st = tr_torrentStat( tor->tor );
 
-        if( TR_STATUS_INACTIVE & st->status )
+        if( !TR_STATUS_IS_ACTIVE( st->status ) )
         {
             tr_torrentStart( tor->tor );
@@ -210 +210 @@
         const tr_stat  * st = tr_torrentStat( tor->tor );
 
-        if( TR_STATUS_ACTIVE & st->status )
+        if( TR_STATUS_IS_ACTIVE( st->status ) )
         {
             tr_torrentStop( tor->tor );
@@ -840 +840 @@
                         inf->hashString, 2 * SHA_DIGEST_LENGTH, 1 );
         tr_bencInitInt( tr_bencDictAdd( tor, "paused" ),
-                        ( TR_STATUS_INACTIVE & st->status ? 1 : 0 ) );
+                        !TR_STATUS_IS_ACTIVE( st->status ) );
         tr_bencInitStr( tr_bencDictAdd( tor, "directory" ),
                         tr_torrentGetFolder( ii->tor ), -1, 1 );

trunk/gtk/main.c

@@ -194 +194 @@
     int status = 0;
     gtk_tree_selection_selected_foreach( s, accumulateStatusForeach, &status );
-    action_sensitize( "pause-torrent", (status & TR_STATUS_ACTIVE) != 0);
-    action_sensitize( "start-torrent", (status & TR_STATUS_INACTIVE) != 0);
+    action_sensitize( "pause-torrent", TR_STATUS_IS_ACTIVE(status) );
+    action_sensitize( "start-torrent", !TR_STATUS_IS_ACTIVE(status) );
     action_sensitize( "remove-torrent", status != 0);
     action_sensitize( "verify-torrent", status != 0);

trunk/libtransmission/ipcparse.c

@@ -859 +859 @@
                 break;
             case IPC_ST_RUNNING:
-                tr_bencInitInt( item,
-                                ( TR_STATUS_INACTIVE & st->status ? 0 : 1 ) );
+                tr_bencInitInt( item, TR_STATUS_IS_ACTIVE(st->status) );
                 break;
             case IPC_ST_STATE:
@@ -879 +878 @@
                     tr_bencInitStr( item, "seeding", -1, 1 );
                 }
-                else if( TR_STATUS_INACTIVE & st->status )
+                else if( TR_STATUS_STOPPED & st->status )
                 {
                     tr_bencInitStr( item, "paused", -1, 1 );

trunk/libtransmission/transmission.h

@@ -611 +611 @@
 tr_torrent_status;
 
-#define TR_STATUS_ACTIVE \
-    (TR_STATUS_CHECK_WAIT|TR_STATUS_CHECK|TR_STATUS_DOWNLOAD|TR_STATUS_DONE|TR_STATUS_SEED)
-#define TR_STATUS_INACTIVE \
-    (TR_STATUS_STOPPED)
+#define TR_STATUS_IS_ACTIVE(s) ((s) != TR_STATUS_STOPPED)
 
 /***********************************************************************