[or-cvs] r12019: Remove the obsolete warned_conflicts field: a v3 consensus c (in tor/trunk: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2007-10-18 10:19:53 -0400 (Thu, 18 Oct 2007)
New Revision: 12019

Modified:
   tor/trunk/
   tor/trunk/src/or/networkstatus.c
Log:
 r15906@catbus:  nickm | 2007-10-18 10:00:08 -0400
 Remove the obsolete warned_conflicts field: a v3 consensus cannot conflict with itself.



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

Modified: tor/trunk/src/or/networkstatus.c
===================================================================
--- tor/trunk/src/or/networkstatus.c	2007-10-18 14:19:51 UTC (rev 12018)
+++ tor/trunk/src/or/networkstatus.c	2007-10-18 14:19:53 UTC (rev 12019)
@@ -48,10 +48,6 @@
 /** Download status for the current consensus networkstatus. */
 static download_status_t consensus_dl_status = { 0, 0};
 
-/** List of strings for nicknames or fingerprints we've already warned about
- * and that are still conflicted. */ /*XXXX020 obsoleted by v3 dirs? */
-static smartlist_t *warned_conflicts = NULL;
-
 /** True iff we have logged a warning about this OR not being valid or
  * not being named. */
 static int have_warned_about_invalid_status = 0;
@@ -76,11 +72,6 @@
                       rs->name_lookup_warned = 0);
   }
 
-  if (!warned_conflicts)
-    warned_conflicts = smartlist_create();
-  SMARTLIST_FOREACH(warned_conflicts, char *, cp, tor_free(cp));
-  smartlist_clear(warned_conflicts); /* now the list is empty. */
-
   have_warned_about_invalid_status = 0;
   have_warned_about_old_version = 0;
   have_warned_about_new_version = 0;
@@ -1312,11 +1303,6 @@
     current_consensus = NULL;
   }
   tor_free(consensus_waiting_for_certs_body);
-  if (warned_conflicts) {
-    SMARTLIST_FOREACH(warned_conflicts, char *, cp, tor_free(cp));
-    smartlist_free(warned_conflicts);
-    warned_conflicts = NULL;
-  }
   if (named_server_map) {
     strmap_free(named_server_map, _tor_free);
   }