From 264f7ab8b30c798615c933d1e1bd67d6282557ed Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Sat, 20 Oct 2007 21:17:37 +0000 Subject: [PATCH] Dead code removal (TR_STATUS_STOPPING) --- cli/transmissioncli.c | 4 ---- gtk/tr_torrent.c | 4 ---- libtransmission/ipcparse.c | 4 ---- libtransmission/transmission.h | 5 ++--- 4 files changed, 2 insertions(+), 15 deletions(-) diff --git a/cli/transmissioncli.c b/cli/transmissioncli.c index c2f02fd1a..df7545862 100644 --- a/cli/transmissioncli.c +++ b/cli/transmissioncli.c @@ -313,10 +313,6 @@ int main( int argc, char ** argv ) s->peersGettingFromUs, s->peersConnected, s->rateUpload, getStringRatio(s->ratio) ); } - else if( s->status & TR_STATUS_STOPPING ) - { - chars = snprintf( string, sizeof string, "Stopping..." ); - } else if( s->status & TR_STATUS_INACTIVE ) { break; diff --git a/gtk/tr_torrent.c b/gtk/tr_torrent.c index f8d852eba..6b7327b6d 100644 --- a/gtk/tr_torrent.c +++ b/gtk/tr_torrent.c @@ -331,10 +331,6 @@ tr_torrent_status_str ( TrTorrent * gtor ) upeers, tpeers ); break; - case TR_STATUS_STOPPING: - top = g_strdup( _("Stopping...") ); - break; - case TR_STATUS_STOPPED: top = g_strdup_printf( _("Stopped (%.1f%%)"), prog ); break; diff --git a/libtransmission/ipcparse.c b/libtransmission/ipcparse.c index 642c39340..c20781afd 100644 --- a/libtransmission/ipcparse.c +++ b/libtransmission/ipcparse.c @@ -878,10 +878,6 @@ ipc_addstat( benc_val_t * list, int tor, { tr_bencInitStr( item, "seeding", -1, 1 ); } - else if( TR_STATUS_STOPPING & st->status ) - { - tr_bencInitStr( item, "stopping", -1, 1 ); - } else if( TR_STATUS_INACTIVE & st->status ) { tr_bencInitStr( item, "paused", -1, 1 ); diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h index 23e289cf7..8498b12b6 100644 --- a/libtransmission/transmission.h +++ b/libtransmission/transmission.h @@ -606,15 +606,14 @@ typedef enum we're a seeder, but due to DND files there's nothing we want right now */ TR_STATUS_SEED = (1<<4), /* Seeding */ - TR_STATUS_STOPPING = (1<<5), /* Stopping -- closing connections, etc. */ - TR_STATUS_STOPPED = (1<<6) /* Torrent is stopped */ + TR_STATUS_STOPPED = (1<<5) /* Torrent is stopped */ } 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_STOPPING|TR_STATUS_STOPPED) + (TR_STATUS_STOPPED) /*********************************************************************** * tr_stat