[tor-commits] [tor/master] Search-and-replace to regain coding style in wake of 13822.

[nickm at torproject.org]

commit 8b82f6261ea5c3fa154315f74be57710865e9a6b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Feb 7 08:32:04 2015 -0500

    Search-and-replace to regain coding style in wake of 13822.
    
    (all-caps should be reserved for global or module-global constants and
---
 src/or/config.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 144499e..c21c966 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3180,34 +3180,34 @@ options_validate(or_options_t *old_options, or_options_t *options,
     options->RelayBandwidthRate = options->RelayBandwidthBurst;
 
   if (server_mode(options)) {
-    const unsigned ROUTER_REQUIRED_MIN_BANDWIDTH = // tolower XXXX
+    const unsigned required_min_bw =
       public_server_mode(options) ?
        RELAY_REQUIRED_MIN_BANDWIDTH : BRIDGE_REQUIRED_MIN_BANDWIDTH;
     const char * const optbridge =
       public_server_mode(options) ? "" : "bridge ";
-    if (options->BandwidthRate < ROUTER_REQUIRED_MIN_BANDWIDTH) {
+    if (options->BandwidthRate < required_min_bw) {
       tor_asprintf(msg,
                        "BandwidthRate is set to %d bytes/second. "
                        "For %sservers, it must be at least %u.",
                        (int)options->BandwidthRate, optbridge,
-                       ROUTER_REQUIRED_MIN_BANDWIDTH);
+                       required_min_bw);
       return -1;
     } else if (options->MaxAdvertisedBandwidth <
-               ROUTER_REQUIRED_MIN_BANDWIDTH/2) {
+               required_min_bw/2) {
       tor_asprintf(msg,
                        "MaxAdvertisedBandwidth is set to %d bytes/second. "
                        "For %sservers, it must be at least %u.",
                        (int)options->MaxAdvertisedBandwidth, optbridge,
-                       ROUTER_REQUIRED_MIN_BANDWIDTH/2);
+                       required_min_bw/2);
       return -1;
     }
     if (options->RelayBandwidthRate &&
-      options->RelayBandwidthRate < ROUTER_REQUIRED_MIN_BANDWIDTH) {
+      options->RelayBandwidthRate < required_min_bw) {
       tor_asprintf(msg,
                        "RelayBandwidthRate is set to %d bytes/second. "
                        "For %sservers, it must be at least %u.",
                        (int)options->RelayBandwidthRate, optbridge,
-                       ROUTER_REQUIRED_MIN_BANDWIDTH);
+                       required_min_bw);
       return -1;
     }
   }