[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] minor cleanup



Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or

Modified Files:
	circuitbuild.c 
Log Message:
minor cleanup


Index: circuitbuild.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/circuitbuild.c,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -d -r1.162 -r1.163
--- circuitbuild.c	24 Nov 2005 06:43:39 -0000	1.162
+++ circuitbuild.c	24 Nov 2005 06:44:13 -0000	1.163
@@ -1246,7 +1246,6 @@
 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 @@
       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();