Dead code removal (TR_STATUS_STOPPING)

This commit is contained in:
Charles Kerr 2007-10-20 21:17:37 +00:00
parent 89cb2a53e9
commit 264f7ab8b3
4 changed files with 2 additions and 15 deletions

View File

@ -313,10 +313,6 @@ int main( int argc, char ** argv )
s->peersGettingFromUs, s->peersConnected, s->peersGettingFromUs, s->peersConnected,
s->rateUpload, getStringRatio(s->ratio) ); 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 ) else if( s->status & TR_STATUS_INACTIVE )
{ {
break; break;

View File

@ -331,10 +331,6 @@ tr_torrent_status_str ( TrTorrent * gtor )
upeers, tpeers ); upeers, tpeers );
break; break;
case TR_STATUS_STOPPING:
top = g_strdup( _("Stopping...") );
break;
case TR_STATUS_STOPPED: case TR_STATUS_STOPPED:
top = g_strdup_printf( _("Stopped (%.1f%%)"), prog ); top = g_strdup_printf( _("Stopped (%.1f%%)"), prog );
break; break;

View File

@ -878,10 +878,6 @@ ipc_addstat( benc_val_t * list, int tor,
{ {
tr_bencInitStr( item, "seeding", -1, 1 ); 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 ) else if( TR_STATUS_INACTIVE & st->status )
{ {
tr_bencInitStr( item, "paused", -1, 1 ); tr_bencInitStr( item, "paused", -1, 1 );

View File

@ -606,15 +606,14 @@ typedef enum
we're a seeder, but due to DND files we're a seeder, but due to DND files
there's nothing we want right now */ there's nothing we want right now */
TR_STATUS_SEED = (1<<4), /* Seeding */ TR_STATUS_SEED = (1<<4), /* Seeding */
TR_STATUS_STOPPING = (1<<5), /* Stopping -- closing connections, etc. */ TR_STATUS_STOPPED = (1<<5) /* Torrent is stopped */
TR_STATUS_STOPPED = (1<<6) /* Torrent is stopped */
} }
tr_torrent_status; tr_torrent_status;
#define TR_STATUS_ACTIVE \ #define TR_STATUS_ACTIVE \
(TR_STATUS_CHECK_WAIT|TR_STATUS_CHECK|TR_STATUS_DOWNLOAD|TR_STATUS_DONE|TR_STATUS_SEED) (TR_STATUS_CHECK_WAIT|TR_STATUS_CHECK|TR_STATUS_DOWNLOAD|TR_STATUS_DONE|TR_STATUS_SEED)
#define TR_STATUS_INACTIVE \ #define TR_STATUS_INACTIVE \
(TR_STATUS_STOPPING|TR_STATUS_STOPPED) (TR_STATUS_STOPPED)
/*********************************************************************** /***********************************************************************
* tr_stat * tr_stat