[or-cvs] stop trying to print a NULL

[arma@seul.org (Roger Dingledine)]

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

Modified Files:
	connection.c dirserv.c 
Log Message:
stop trying to print a NULL
plus make router_nickname_is_approved() more obviously unused


Index: connection.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection.c,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -d -r1.257 -r1.258
--- connection.c	13 Oct 2004 20:05:57 -0000	1.257
+++ connection.c	13 Oct 2004 20:17:45 -0000	1.258
@@ -739,7 +739,7 @@
        /* 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);
        }
     }

Index: dirserv.c
===================================================================
RCS file: /home/or/cvsroot/src/or/dirserv.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- dirserv.c	13 Oct 2004 19:17:27 -0000	1.95
+++ dirserv.c	13 Oct 2004 20:17:45 -0000	1.96
@@ -200,6 +200,7 @@
   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 @@
   else
     return 0;
 }
+#endif
 
 /** Clear the current fingerprint list. */
 void