Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-23 20:08:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

disambiguate some of the tr_stat_t variables' names

Browse Source
This commit is contained in:
Charles Kerr
2007-07-16 00:50:43 +00:00
parent 17a59e129c
commit 82fbfb4c47
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cli/transmissioncli.c
View File

@@ -267,15 +267,15 @@ int main( int argc, char ** argv )
"Progress: %.2f %%, %d peer%s, dl from %d (%.2f KB/s), " "Progress: %.2f %%, %d peer%s, dl from %d (%.2f KB/s), "
"ul to %d (%.2f KB/s) [%s]", 100.0 * s->percentDone, "ul to %d (%.2f KB/s) [%s]", 100.0 * s->percentDone,
s->peersConnected, ( s->peersConnected == 1 ) ? "" : "s", s->peersConnected, ( s->peersConnected == 1 ) ? "" : "s",
s->peersUploading, s->rateDownload, s->peersSendingToUs, s->rateDownload,
s->peersDownloading, s->rateUpload, s->peersGettingFromUs, s->rateUpload,
getStringRatio(s->ratio) ); getStringRatio(s->ratio) );
} }
else if( s->status & TR_STATUS_SEED ) else if( s->status & TR_STATUS_SEED )
{ {
chars = snprintf( string, sizeof string, chars = snprintf( string, sizeof string,
"Seeding, uploading to %d of %d peer(s), %.2f KB/s [%s]", "Seeding, uploading to %d of %d peer(s), %.2f KB/s [%s]",
s->peersDownloading, s->peersTotal, s->peersGettingFromUs, s->peersTotal,
s->rateUpload, getStringRatio(s->ratio) ); s->rateUpload, getStringRatio(s->ratio) );
} }
else if( s->status & TR_STATUS_STOPPING ) else if( s->status & TR_STATUS_STOPPING )

4
gtk/tr_core.c
View File

@@ -611,8 +611,8 @@ tr_core_update( TrCore * self )
MC_URATE, st->rateUpload, MC_URATE, st->rateUpload,
MC_ETA, st->eta, MC_ETA, st->eta,
MC_PEERS, st->peersConnected, MC_PEERS, st->peersConnected,
MC_UPEERS, st->peersUploading, MC_UPEERS, st->peersGettingFromUs,
MC_DPEERS, st->peersDownloading, MC_DPEERS, st->peersSendingToUs,
MC_SEED, st->seeders, MC_SEED, st->seeders,
MC_LEECH, st->leechers, MC_LEECH, st->leechers,
MC_DONE, st->completedFromTracker, MC_DONE, st->completedFromTracker,

2
gtk/tr_torrent.c
View File

@@ -605,7 +605,7 @@ tr_torrent_status_str ( TrTorrent * gtor )
const tr_stat_t * st = tr_torrent_stat( gtor ); const tr_stat_t * st = tr_torrent_stat( gtor );
const int tpeers = MAX (st->peersConnected, 0); const int tpeers = MAX (st->peersConnected, 0);
const int upeers = MAX (st->peersUploading, 0); const int upeers = MAX (st->peersGettingFromUs, 0);
const int eta = st->eta; const int eta = st->eta;
const double prog = st->percentDone * 100.0; /* [0...100] */ const double prog = st->percentDone * 100.0; /* [0...100] */

4
libtransmission/ipcparse.c
View File

@@ -842,7 +842,7 @@ ipc_addstat( benc_val_t * list, int tor,
tr_bencInitInt( item, tor ); tr_bencInitInt( item, tor );
break; break;
case IPC_ST_PEERDOWN: case IPC_ST_PEERDOWN:
tr_bencInitInt( item, st->peersDownloading ); tr_bencInitInt( item, st->peersSendingToUs );
break; break;
case IPC_ST_PEERFROM: case IPC_ST_PEERFROM:
tr_bencInit( item, TYPE_DICT ); tr_bencInit( item, TYPE_DICT );
@@ -863,7 +863,7 @@ ipc_addstat( benc_val_t * list, int tor,
tr_bencInitInt( item, st->peersTotal ); tr_bencInitInt( item, st->peersTotal );
break; break;
case IPC_ST_PEERUP: case IPC_ST_PEERUP:
tr_bencInitInt( item, st->peersUploading ); tr_bencInitInt( item, st->peersGettingFromUs );
break; break;
case IPC_ST_RUNNING: case IPC_ST_RUNNING:
tr_bencInitInt( item, tr_bencInitInt( item,

12
libtransmission/torrent.c
View File

@@ -552,10 +552,10 @@ tr_torrentStat( tr_torrent_t * tor )
/* peers... */ /* peers... */
memset( s->peersFrom, 0, sizeof( s->peersFrom ) ); memset( s->peersFrom, 0, sizeof( s->peersFrom ) );
s->peersTotal = tor->peerCount; s->peersTotal = tor->peerCount;
s->peersConnected = 0; s->peersConnected = 0;
s->peersUploading = 0; s->peersSendingToUs = 0;
s->peersDownloading = 0; s->peersGettingFromUs = 0;
for( i=0; i<tor->peerCount; ++i ) for( i=0; i<tor->peerCount; ++i )
{ {
@@ -567,10 +567,10 @@ tr_torrentStat( tr_torrent_t * tor )
++s->peersFrom[tr_peerIsFrom(peer)]; ++s->peersFrom[tr_peerIsFrom(peer)];
if( tr_peerDownloadRate( peer ) > 0.01 ) if( tr_peerDownloadRate( peer ) > 0.01 )
++s->peersUploading; ++s->peersSendingToUs;
if( tr_peerUploadRate( peer ) > 0.01 ) if( tr_peerUploadRate( peer ) > 0.01 )
++s->peersDownloading; ++s->peersGettingFromUs;
} }
} }

4
libtransmission/transmission.h
View File

@@ -570,8 +570,8 @@ struct tr_stat_s
int peersTotal; int peersTotal;
int peersConnected; int peersConnected;
int peersFrom[TR_PEER_FROM__MAX]; int peersFrom[TR_PEER_FROM__MAX];
int peersUploading; int peersSendingToUs;
int peersDownloading; int peersGettingFromUs;
int seeders; int seeders;
int leechers; int leechers;
int completedFromTracker; int completedFromTracker;