From 2b7b86f5e65819df2598c220b75f1767384f2d11 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Wed, 13 Oct 2004 20:17:45 +0000 Subject: [PATCH] stop trying to print a NULL plus make router_nickname_is_approved() more obviously unused svn:r2469 --- src/or/connection.c | 2 +- src/or/dirserv.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/or/connection.c b/src/or/connection.c index 53ab7b0833..f01502f1db 100644 --- 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 862862596f..75cfde30aa 100644 --- 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 nickname with digest * 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