aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2016-08-25 14:52:25 -0400
committerDavid Goulet <dgoulet@torproject.org>2016-08-25 14:52:28 -0400
commit9e1cb3660b007e26ea84175d3695b2791c4cbd87 (patch)
tree2688b2ef5e0c2d28d12f36b0c655360881f7c1b5 /src
parent90bcfa2274a7b95bd4ff76b1c5c05e05cb8e571f (diff)
downloadtor-9e1cb3660b007e26ea84175d3695b2791c4cbd87.tar.gz
tor-9e1cb3660b007e26ea84175d3695b2791c4cbd87.zip
Fix duplicated if condition in connection.c
Furthermore, fix a test that could returned an uninitialized value. Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src')
-rw-r--r--src/or/connection.c2
-rw-r--r--src/test/test_oos.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/or/connection.c b/src/or/connection.c
index 9b583f4243..e3560af4c5 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -4511,7 +4511,7 @@ oos_victim_comparator_for_orconns(or_connection_t *a, or_connection_t *b)
b_circs = connection_or_get_num_circuits(b);
if (a_circs < b_circs) return -1;
- else if (b_circs > a_circs) return 1;
+ else if (a_circs > b_circs) return 1;
else return 0;
}
diff --git a/src/test/test_oos.c b/src/test/test_oos.c
index 9451c5c537..3afb68b27a 100644
--- a/src/test/test_oos.c
+++ b/src/test/test_oos.c
@@ -67,7 +67,7 @@ static int pick_oos_mock_last_n = 0;
static smartlist_t *
pick_oos_victims_mock(int n)
{
- smartlist_t *l;
+ smartlist_t *l = NULL;
int i;
++pick_oos_mock_calls;