[tor-commits] [tor/master] Use K&R style

nickm at torproject.org nickm at torproject.org
Wed Jun 13 21:04:12 UTC 2012


commit a0f76289fd8b778dd6a46c8726fddfc15d68193d
Author: Andrea Shepard <andrea at persephoneslair.org>
Date:   Tue Jun 12 19:31:01 2012 -0700

    Use K&R style
---
 src/or/circuitbuild.c |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 61576d1..8efaa7c 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -482,8 +482,7 @@ circuit_build_times_new_consensus_params(circuit_build_times_t *cbt,
         cbt->liveness.num_recent_circs = num;
       }
       /* else no change, nothing to do */
-    }
-    else { /* num == 0 */
+    } else { /* num == 0 */
       /*
        * Weird.  This probably shouldn't happen, so log a warning, but try
        * to do something sensible anyway.
@@ -501,8 +500,7 @@ circuit_build_times_new_consensus_params(circuit_build_times_t *cbt,
 
       cbt->liveness.num_recent_circs = num;
     }
-  }
-  else {
+  } else {
     /*
      * Adaptive timeouts are disabled; this might be because of the
      * LearnCircuitBuildTimes config parameter, and hence permanent, or
@@ -551,8 +549,7 @@ circuit_build_times_get_initial_timeout(void)
     } else {
       timeout = circuit_build_times_initial_timeout();
     }
-  }
-  else {
+  } else {
     timeout = get_options()->CircuitBuildTimeout*1000;
   }
 
@@ -593,8 +590,7 @@ circuit_build_times_init(circuit_build_times_t *cbt)
       circuit_build_times_recent_circuit_count(NULL);
     cbt->liveness.timeouts_after_firsthop =
       tor_malloc_zero(sizeof(int8_t)*cbt->liveness.num_recent_circs);
-  }
-  else {
+  } else {
     cbt->liveness.num_recent_circs = 0;
     cbt->liveness.timeouts_after_firsthop = NULL;
   }





More information about the tor-commits mailing list