summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Shepard <andrea@persephoneslair.org>2012-06-12 19:31:01 -0700
committerNick Mathewson <nickm@torproject.org>2012-06-13 16:45:12 -0400
commita0f76289fd8b778dd6a46c8726fddfc15d68193d (patch)
treef9f67a1a69b329897a8a5e887600b0aaf38cf78b
parent7df26de948d478bd9d1d85ffb54ca81f9f7488f1 (diff)
downloadtor-a0f76289fd8b778dd6a46c8726fddfc15d68193d.tar.gz
tor-a0f76289fd8b778dd6a46c8726fddfc15d68193d.zip
Use K&R style
-rw-r--r--src/or/circuitbuild.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 61576d12dd..8efaa7cf4d 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;
}