[or-cvs] [tor/maint-0.2.1] Fix a signed/unsigned compile warning in 0.2.1.19

[arma at seul.org]

Author: Roger Dingledine <arma at torproject.org>
Date: Tue, 28 Jul 2009 18:34:35 -0400
Subject: Fix a signed/unsigned compile warning in 0.2.1.19
Commit: 6249b0fd7757293876549c58c6cfe351d44a1d11

---
 ChangeLog       |    5 +++++
 src/or/config.c |    8 ++++----
 src/or/or.h     |    4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ed76e22..4fb38cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Changes in version 0.2.1.20 - 2009-??-??
+  o Minor bugfixes:
+    - Fix a signed/unsigned compile warning in 0.2.1.19.
+
+
 Changes in version 0.2.1.19 - 2009-07-28
   o Major bugfixes:
     - Make accessing hidden services on 0.2.1.x work right
diff --git a/src/or/config.c b/src/or/config.c
index 3f45b1e..fa986a6 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1224,10 +1224,10 @@ options_need_geoip_info(or_options_t *options, const char **reason_out)
 
 /** Return the bandwidthrate that we are going to report to the authorities
  * based on the config options. */
-int
+uint32_t
 get_effective_bwrate(or_options_t *options)
 {
-  int bw = (int)options->BandwidthRate;
+  uint32_t bw = (int)options->BandwidthRate;
   if (bw > options->MaxAdvertisedBandwidth)
     bw = (int)options->MaxAdvertisedBandwidth;
   if (options->RelayBandwidthRate > 0 && bw > options->RelayBandwidthRate)
@@ -1237,10 +1237,10 @@ get_effective_bwrate(or_options_t *options)
 
 /** Return the bandwidthburst that we are going to report to the authorities
  * based on the config options. */
-int
+uint32_t
 get_effective_bwburst(or_options_t *options)
 {
-  int bw = (int)options->BandwidthBurst;
+  uint32_t bw = (int)options->BandwidthBurst;
   if (options->RelayBandwidthBurst > 0 && bw > options->RelayBandwidthBurst)
     bw = (int)options->RelayBandwidthBurst;
   return bw;
diff --git a/src/or/or.h b/src/or/or.h
index 1dcff28..319b3a9 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2926,8 +2926,8 @@ int options_need_geoip_info(or_options_t *options, const char **reason_out);
 int getinfo_helper_config(control_connection_t *conn,
                           const char *question, char **answer);
 
-int get_effective_bwrate(or_options_t *options);
-int get_effective_bwburst(or_options_t *options);
+uint32_t get_effective_bwrate(or_options_t *options);
+uint32_t get_effective_bwburst(or_options_t *options);
 
 #ifdef CONFIG_PRIVATE
 /* Used only by config.c and test.c */
-- 
1.5.6.5