diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-08-15 23:43:36 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-08-15 23:43:36 -0400 |
| commit | a856f446c7c95b338157511a55760575751544bc (patch) | |
| tree | ab41ef6eeebdaaf72299193d8fbfd4cc96e10480 /src/test/test.c | |
| parent | 6a77bde8d887bb9dd46c5c75e8bffb2f402feb39 (diff) | |
| parent | 561ca9b987e093755603f1cce8f7d783c7b3006e (diff) | |
| download | tor-a856f446c7c95b338157511a55760575751544bc.tar.gz tor-a856f446c7c95b338157511a55760575751544bc.zip | |
Merge commit 'sebastian/bug1831'
Diffstat (limited to 'src/test/test.c')
| -rw-r--r-- | src/test/test.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/test/test.c b/src/test/test.c index 2d396b5815..5a37f1da8d 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -485,7 +485,6 @@ test_circuit_timeout(void) circuit_build_times_t final; double timeout1, timeout2; or_state_t state; - char *msg; int i, runs; double close_ms; circuit_build_times_init(&initial); @@ -525,7 +524,7 @@ test_circuit_timeout(void) test_assert(estimate.total_build_times <= CBT_NCIRCUITS_TO_OBSERVE); circuit_build_times_update_state(&estimate, &state); - test_assert(circuit_build_times_parse_state(&final, &state, &msg) == 0); + test_assert(circuit_build_times_parse_state(&final, &state) == 0); circuit_build_times_update_alpha(&final); timeout2 = circuit_build_times_calculate_timeout(&final, @@ -627,7 +626,7 @@ test_circuit_timeout(void) circuit_build_times_count_timeout(&final, 1); } -done: + done: return; } |