aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2005-11-24 06:44:13 +0000
committerRoger Dingledine <arma@torproject.org>2005-11-24 06:44:13 +0000
commit2350e487a223b9137b3f53181ff7beca030b6f54 (patch)
tree2b914fd1181c1baa2f3d695dd3c5179af2de1a0e /src
parentea7fe0c2674f4b10d8a9571c7d61844fb18d7f45 (diff)
downloadtor-2350e487a223b9137b3f53181ff7beca030b6f54.tar
tor-2350e487a223b9137b3f53181ff7beca030b6f54.tar.gz
minor cleanup
svn:r5454
Diffstat (limited to 'src')
-rw-r--r--src/or/circuitbuild.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index eabd4edc5..183a8ef26 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -1246,7 +1246,6 @@ static routerinfo_t *
choose_good_exit_server(uint8_t purpose, routerlist_t *dir,
int need_uptime, int need_capacity, int is_internal)
{
- routerinfo_t *r;
or_options_t *options = get_options();
switch (purpose) {
case CIRCUIT_PURPOSE_C_GENERAL:
@@ -1257,10 +1256,9 @@ choose_good_exit_server(uint8_t purpose, routerlist_t *dir,
else
return choose_good_exit_server_general(dir, need_uptime, need_capacity);
case CIRCUIT_PURPOSE_C_ESTABLISH_REND:
- r = router_choose_random_node(options->RendNodes, options->RendExcludeNodes,
- NULL, need_uptime, need_capacity,
- options->_AllowUnverified & ALLOW_UNVERIFIED_RENDEZVOUS, 0);
- return r;
+ return router_choose_random_node(options->RendNodes, options->RendExcludeNodes,
+ NULL, need_uptime, need_capacity,
+ options->_AllowUnverified & ALLOW_UNVERIFIED_RENDEZVOUS, 0);
}
warn(LD_BUG,"Bug: unhandled purpose %d", purpose);
tor_fragile_assert();