[or-cvs] r10053: Oops; the rest of the last patch. If that one gets backporte (in tor/trunk: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2007-04-30 01:36:41 -0400 (Mon, 30 Apr 2007)
New Revision: 10053

Modified:
   tor/trunk/
   tor/trunk/src/or/or.h
   tor/trunk/src/or/routerlist.c
Log:
 r12557@catbus:  nickm | 2007-04-30 01:36:39 -0400
 Oops; the rest of the last patch. If that one gets backported, this should too.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r12557] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h	2007-04-30 05:32:57 UTC (rev 10052)
+++ tor/trunk/src/or/or.h	2007-04-30 05:36:41 UTC (rev 10053)
@@ -3094,6 +3094,8 @@
 int getinfo_helper_networkstatus(control_connection_t *conn,
                                  const char *question, char **answer);
 
+void routerlist_assert_ok(routerlist_t *rl);
+
 /********************************* routerparse.c ************************/
 
 #define MAX_STATUS_TAG_LEN 32

Modified: tor/trunk/src/or/routerlist.c
===================================================================
--- tor/trunk/src/or/routerlist.c	2007-04-30 05:32:57 UTC (rev 10052)
+++ tor/trunk/src/or/routerlist.c	2007-04-30 05:36:41 UTC (rev 10053)
@@ -33,7 +33,6 @@
 static void update_networkstatus_cache_downloads(time_t now);
 static void update_networkstatus_client_downloads(time_t now);
 static int signed_desc_digest_is_recognized(signed_descriptor_t *desc);
-static void routerlist_assert_ok(routerlist_t *rl);
 static int have_tried_downloading_all_statuses(int n_failures);
 static routerstatus_t *networkstatus_find_entry(networkstatus_t *ns,
                                                 const char *digest);
@@ -4668,13 +4667,13 @@
 
 /** Assert that the internal representation of <b>rl</b> is
  * self-consistent. */
-static void
+void
 routerlist_assert_ok(routerlist_t *rl)
 {
   digestmap_iter_t *iter;
   routerinfo_t *r2;
   signed_descriptor_t *sd2;
-  if (!rl);
+  if (!rl)
     return;
   SMARTLIST_FOREACH(rl->routers, routerinfo_t *, r,
   {