From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 30 Jul 2009 13:15:07 +0000 (-0400)
Subject: Fix signed/unsigned comparison warnings in get_effective_bw(rate|burst)
X-Git-Tag: tor-0.2.2.1-alpha~36
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=efe966944d6f8fd4374ccc19b10adfe762034f47;p=thirdparty%2Ftor.git

Fix signed/unsigned comparison warnings in get_effective_bw(rate|burst)
---

diff --git a/src/or/config.c b/src/or/config.c
index 9f9fef9d9a..cedd7f7529 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1224,12 +1224,12 @@ options_need_geoip_info(or_options_t *options, const char **reason_out)
 int
 get_effective_bwrate(or_options_t *options)
 {
-  int bw = (int)options->BandwidthRate;
+  uint64_t bw = options->BandwidthRate;
   if (bw > options->MaxAdvertisedBandwidth)
-    bw = (int)options->MaxAdvertisedBandwidth;
+    bw = options->MaxAdvertisedBandwidth;
   if (options->RelayBandwidthRate > 0 && bw > options->RelayBandwidthRate)
-    bw = (int)options->RelayBandwidthRate;
-  return bw;
+    bw = options->RelayBandwidthRate;
+  return (int)bw;
 }
 
 /** Return the bandwidthburst that we are going to report to the authorities
@@ -1237,10 +1237,10 @@ get_effective_bwrate(or_options_t *options)
 int
 get_effective_bwburst(or_options_t *options)
 {
-  int bw = (int)options->BandwidthBurst;
+  uint64_t bw = options->BandwidthBurst;
   if (options->RelayBandwidthBurst > 0 && bw > options->RelayBandwidthBurst)
-    bw = (int)options->RelayBandwidthBurst;
-  return bw;
+    bw = options->RelayBandwidthBurst;
+  return (int)bw;
 }
 
 /** Fetch the active option list, and take actions based on it. All of the