[tor-commits] [tor/master] Remove addr_policy_assert_ok() as unused

nickm at torproject.org nickm at torproject.org
Fri Oct 12 15:39:44 UTC 2018


commit aff5bf5464172bbbe549e147ebd4ba809a8b252c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Sep 30 23:45:17 2018 -0500

    Remove addr_policy_assert_ok() as unused
---
 src/feature/dirparse/routerparse.c | 12 ------------
 src/feature/dirparse/routerparse.h |  2 --
 2 files changed, 14 deletions(-)

diff --git a/src/feature/dirparse/routerparse.c b/src/feature/dirparse/routerparse.c
index 05013ef7f..f661042fe 100644
--- a/src/feature/dirparse/routerparse.c
+++ b/src/feature/dirparse/routerparse.c
@@ -3373,18 +3373,6 @@ router_parse_addr_policy_private(directory_token_t *tok)
   return addr_policy_get_canonical_entry(&result);
 }
 
-/** Log and exit if <b>t</b> is malformed */
-void
-assert_addr_policy_ok(smartlist_t *lst)
-{
-  if (!lst) return;
-  SMARTLIST_FOREACH(lst, addr_policy_t *, t, {
-    tor_assert(t->policy_type == ADDR_POLICY_REJECT ||
-               t->policy_type == ADDR_POLICY_ACCEPT);
-    tor_assert(t->prt_min <= t->prt_max);
-  });
-}
-
 /** Return a newly allocated smartlist of all accept or reject tokens in
  * <b>s</b>.
  */
diff --git a/src/feature/dirparse/routerparse.h b/src/feature/dirparse/routerparse.h
index 7b514afbb..f90ad08a9 100644
--- a/src/feature/dirparse/routerparse.h
+++ b/src/feature/dirparse/routerparse.h
@@ -46,8 +46,6 @@ extrainfo_t *extrainfo_parse_entry_from_string(const char *s, const char *end,
 MOCK_DECL(addr_policy_t *, router_parse_addr_policy_item_from_string,
          (const char *s, int assume_action, int *malformed_list));
 
-void assert_addr_policy_ok(smartlist_t *t);
-
 int compare_vote_routerstatus_entries(const void **_a, const void **_b);
 int networkstatus_verify_bw_weights(networkstatus_t *ns, int);
 networkstatus_t *networkstatus_parse_vote_from_string(const char *s,





More information about the tor-commits mailing list