From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 25 Feb 2010 22:00:14 +0000 (-0500)
Subject: For integers, if !(E<G), then we can infer that E>=G.
X-Git-Tag: tor-0.2.2.10-alpha~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=512cebadad978e1f5ef87081f15bd25f8b7a4a7e;p=thirdparty%2Ftor.git

For integers, if !(E<G), then we can infer that E>=G.

This means that "if (E<G) {abc} else if (E>=G) {def}" can be replaced with
"if (E<G) {abc} else {def}"

Doing the second test explicitly made my mingw gcc nervous that we might
never be initializing casename.
---

diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index 505af38cfc..706e6e4480 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -842,7 +842,7 @@ networkstatus_compute_bw_weights_v9(smartlist_t *chunks, int64_t G, int64_t M,
         casename = "Case 2a (E scarce)";
         Wed = weight_scale;
         Wgd = 0;
-      } else if (E >= G) {
+      } else { /* E >= G */
         casename = "Case 2a (G scarce)";
         Wed = 0;
         Wgd = weight_scale;