stop trying to print a NULL

plus make router_nickname_is_approved() more obviously unused

svn:r2469

diff --git a/src/or/connection.c b/src/or/connection.c
index 53ab7b0833cc1bcbcdaabf26e98fad4cd1c7fe82..f01502f1dbe345ee8f640add162d96d252586bc5 100644 (file)
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -739,7 +739,7 @@ int connection_handle_read(connection_t *conn) {
        /* XXX I suspect pollerr may make Windows not get to this point. :( */
        router_mark_as_down(conn->identity_digest);
        if(conn->purpose == DIR_PURPOSE_FETCH_DIR && !all_directory_servers_down()) {
-         log_fn(LOG_INFO,"Giving up on dirserver %s; trying another.", conn->nickname);
+         log_fn(LOG_INFO,"Giving up on dirserver %s; trying another.", conn->address);
          directory_get_from_dirserver(DIR_PURPOSE_FETCH_DIR, NULL, 0);
        }
     }

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 862862596ff4028c306029bbca36b07ec0140e62..75cfde30aa4b0c96919ed734dd9b3ff83be75e76 100644 (file)
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -200,6 +200,7 @@ const char *dirserv_get_nickname_by_digest(const char *digest)
   return NULL;
 }
 
+#if 0
 /** Return true iff any router named <b>nickname</b> with <b>digest</b>
  * is in the verified fingerprint list. */
 static int
@@ -213,6 +214,7 @@ router_nickname_is_approved(const char *nickname, const char *digest)
   else
     return 0;
 }
+#endif
 
 /** Clear the current fingerprint list. */
 void