[or-cvs] r13459: Remove some deadcode. (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2008-02-10 13:40:27 -0500 (Sun, 10 Feb 2008)
New Revision: 13459

Modified:
   tor/trunk/
   tor/trunk/src/or/circuitbuild.c
   tor/trunk/src/or/or.h
   tor/trunk/src/or/routerlist.c
Log:
 r14102 at tombo:  nickm | 2008-02-10 13:30:04 -0500
 Remove some deadcode.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r14102] on 49666b30-7950-49c5-bedf-9dc8f3168102

Modified: tor/trunk/src/or/circuitbuild.c
===================================================================
--- tor/trunk/src/or/circuitbuild.c	2008-02-10 18:40:23 UTC (rev 13458)
+++ tor/trunk/src/or/circuitbuild.c	2008-02-10 18:40:27 UTC (rev 13459)
@@ -1761,33 +1761,6 @@
                            r->onion_pkey, r->addr, r->or_port);
 }
 
-#if 0
-/** What router purpose is <b>digest</b>?
- * It's a general purpose router unless it's on our bridges list.
- */
-static uint8_t
-get_router_purpose_from_digest(char *digest)
-{
-  if (digest_is_a_bridge(digest))
-    return ROUTER_PURPOSE_BRIDGE;
-  return ROUTER_PURPOSE_GENERAL;
-}
-#endif
-
-#if 0
-/** Allocate and return a new extend_info_t that can be used to build a
- * circuit to or through the router <b>r</b>. */
-extend_info_t *
-extend_info_from_routerstatus(routerstatus_t *s)
-{
-  tor_assert(s);
-  /* routerstatus doesn't know onion_key; leave it NULL */
-  return extend_info_alloc(s->nickname, s->identity_digest,
-                           NULL, s->addr, s->or_port);
-//                      get_router_purpose_from_digest(s->identity_digest));
-}
-#endif
-
 /** Release storage held by an extend_info_t struct. */
 void
 extend_info_free(extend_info_t *info)

Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h	2008-02-10 18:40:23 UTC (rev 13458)
+++ tor/trunk/src/or/or.h	2008-02-10 18:40:27 UTC (rev 13459)
@@ -2836,9 +2836,6 @@
 int connection_or_flushed_some(or_connection_t *conn);
 int connection_or_finished_flushing(or_connection_t *conn);
 int connection_or_finished_connecting(or_connection_t *conn);
-#if 0
-int connection_or_finish_or_handshake(or_connection_t *conn);
-#endif
 
 or_connection_t *connection_or_connect(uint32_t addr, uint16_t port,
                                     const char *id_digest);

Modified: tor/trunk/src/or/routerlist.c
===================================================================
--- tor/trunk/src/or/routerlist.c	2008-02-10 18:40:23 UTC (rev 13458)
+++ tor/trunk/src/or/routerlist.c	2008-02-10 18:40:27 UTC (rev 13459)
@@ -837,7 +837,7 @@
   if (choice)
     return choice;
 
-  /* XXXX020 what's the point of *reloading* and trying again?? -NM */
+  /* XXXX020 arma: what's the point of *reloading* and trying again?? -NM */
   log_info(LD_DIR,"Still no %s router entries. Reloading and trying again.",
            (flags & PDS_IGNORE_FASCISTFIREWALL) ? "known" : "reachable");
   if (router_reload_router_list()) {