From 82fbfb4c47dbaaba91d072cc5565732cda7650db Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@transmissionbt.com>
Date: Mon, 16 Jul 2007 00:50:43 +0000
Subject: [PATCH] disambiguate some of the tr_stat_t variables' names

---
 cli/transmissioncli.c          |  6 +++---
 gtk/tr_core.c                  |  4 ++--
 gtk/tr_torrent.c               |  2 +-
 libtransmission/ipcparse.c     |  4 ++--
 libtransmission/torrent.c      | 12 ++++++------
 libtransmission/transmission.h |  4 ++--
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/cli/transmissioncli.c b/cli/transmissioncli.c
index 9845a364e..e47464cbc 100644
--- a/cli/transmissioncli.c
+++ b/cli/transmissioncli.c
@@ -267,15 +267,15 @@ int main( int argc, char ** argv )
                 "Progress: %.2f %%, %d peer%s, dl from %d (%.2f KB/s), "
                 "ul to %d (%.2f KB/s) [%s]", 100.0 * s->percentDone,
                 s->peersConnected, ( s->peersConnected == 1 ) ? "" : "s",
-                s->peersUploading, s->rateDownload,
-                s->peersDownloading, s->rateUpload,
+                s->peersSendingToUs, s->rateDownload,
+                s->peersGettingFromUs, s->rateUpload,
                 getStringRatio(s->ratio) );
         }
         else if( s->status & TR_STATUS_SEED )
         {
             chars = snprintf( string, sizeof string,
                 "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) );
         }
         else if( s->status & TR_STATUS_STOPPING )
diff --git a/gtk/tr_core.c b/gtk/tr_core.c
index e0d759714..69430d67f 100644
--- a/gtk/tr_core.c
+++ b/gtk/tr_core.c
@@ -611,8 +611,8 @@ tr_core_update( TrCore * self )
                             MC_URATE,       st->rateUpload,
                             MC_ETA,         st->eta,
                             MC_PEERS,       st->peersConnected,
-                            MC_UPEERS,      st->peersUploading,
-                            MC_DPEERS,      st->peersDownloading,
+                            MC_UPEERS,      st->peersGettingFromUs,
+                            MC_DPEERS,      st->peersSendingToUs,
                             MC_SEED,        st->seeders,
                             MC_LEECH,       st->leechers,
                             MC_DONE,        st->completedFromTracker,
diff --git a/gtk/tr_torrent.c b/gtk/tr_torrent.c
index 6af352221..cee4c2d90 100644
--- a/gtk/tr_torrent.c
+++ b/gtk/tr_torrent.c
@@ -605,7 +605,7 @@ tr_torrent_status_str ( TrTorrent * gtor )
     const tr_stat_t * st = tr_torrent_stat( gtor );
 
     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 double prog = st->percentDone * 100.0; /* [0...100] */
 
diff --git a/libtransmission/ipcparse.c b/libtransmission/ipcparse.c
index 3290a557f..6035f88d1 100644
--- a/libtransmission/ipcparse.c
+++ b/libtransmission/ipcparse.c
@@ -842,7 +842,7 @@ ipc_addstat( benc_val_t * list, int tor,
                 tr_bencInitInt( item, tor );
                 break;
             case IPC_ST_PEERDOWN:
-                tr_bencInitInt( item, st->peersDownloading );
+                tr_bencInitInt( item, st->peersSendingToUs );
                 break;
             case IPC_ST_PEERFROM:
                 tr_bencInit( item, TYPE_DICT );
@@ -863,7 +863,7 @@ ipc_addstat( benc_val_t * list, int tor,
                 tr_bencInitInt( item, st->peersTotal );
                 break;
             case IPC_ST_PEERUP:
-                tr_bencInitInt( item, st->peersUploading );
+                tr_bencInitInt( item, st->peersGettingFromUs );
                 break;
             case IPC_ST_RUNNING:
                 tr_bencInitInt( item,
diff --git a/libtransmission/torrent.c b/libtransmission/torrent.c
index d96a5a312..f90d37d4b 100644
--- a/libtransmission/torrent.c
+++ b/libtransmission/torrent.c
@@ -552,10 +552,10 @@ tr_torrentStat( tr_torrent_t * tor )
 
     /* peers... */
     memset( s->peersFrom, 0, sizeof( s->peersFrom ) );
-    s->peersTotal        = tor->peerCount;
-    s->peersConnected    = 0;
-    s->peersUploading    = 0;
-    s->peersDownloading  = 0;
+    s->peersTotal          = tor->peerCount;
+    s->peersConnected      = 0;
+    s->peersSendingToUs    = 0;
+    s->peersGettingFromUs  = 0;
 
     for( i=0; i<tor->peerCount; ++i )
     {
@@ -567,10 +567,10 @@ tr_torrentStat( tr_torrent_t * tor )
             ++s->peersFrom[tr_peerIsFrom(peer)];
 
             if( tr_peerDownloadRate( peer ) > 0.01 )
-                ++s->peersUploading;
+                ++s->peersSendingToUs;
 
             if( tr_peerUploadRate( peer ) > 0.01 )
-                ++s->peersDownloading;
+                ++s->peersGettingFromUs;
         }
     }
 
diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h
index ce907a714..178200981 100644
--- a/libtransmission/transmission.h
+++ b/libtransmission/transmission.h
@@ -570,8 +570,8 @@ struct tr_stat_s
     int                 peersTotal;
     int                 peersConnected;
     int                 peersFrom[TR_PEER_FROM__MAX];
-    int                 peersUploading;
-    int                 peersDownloading;
+    int                 peersSendingToUs;
+    int                 peersGettingFromUs;
     int                 seeders;
     int                 leechers;
     int                 completedFromTracker;