nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use K&R style

Browse Source
This commit is contained in:
Andrea Shepard 2012-06-12 19:31:01 -07:00 committed by Nick Mathewson
parent 7df26de948
commit a0f76289fd
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/or/circuitbuild.c
View File

@ -482,8 +482,7 @@ circuit_build_times_new_consensus_params(circuit_build_times_t *cbt,
cbt->liveness.num_recent_circs = num; cbt->liveness.num_recent_circs = num;
} }
/* else no change, nothing to do */ /* else no change, nothing to do */
} } else { /* num == 0 */
else { /* num == 0 */
/* /*
* Weird. This probably shouldn't happen, so log a warning, but try * Weird. This probably shouldn't happen, so log a warning, but try
* to do something sensible anyway. * 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; cbt->liveness.num_recent_circs = num;
} }
} } else {
else {
/* /*
* Adaptive timeouts are disabled; this might be because of the * Adaptive timeouts are disabled; this might be because of the
* LearnCircuitBuildTimes config parameter, and hence permanent, or * LearnCircuitBuildTimes config parameter, and hence permanent, or
@ -551,8 +549,7 @@ circuit_build_times_get_initial_timeout(void)
} else { } else {
timeout = circuit_build_times_initial_timeout(); timeout = circuit_build_times_initial_timeout();
} }
} } else {
else {
timeout = get_options()->CircuitBuildTimeout*1000; 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); circuit_build_times_recent_circuit_count(NULL);
cbt->liveness.timeouts_after_firsthop = cbt->liveness.timeouts_after_firsthop =
tor_malloc_zero(sizeof(int8_t)*cbt->liveness.num_recent_circs); tor_malloc_zero(sizeof(int8_t)*cbt->liveness.num_recent_circs);
} } else {
else {
cbt->liveness.num_recent_circs = 0; cbt->liveness.num_recent_circs = 0;
cbt->liveness.timeouts_after_firsthop = NULL; cbt->liveness.timeouts_after_firsthop = NULL;
} }