[tor-commits] [tor/master] fix whitespace; remove dead code

[nickm at torproject.org]

commit 65a6489e5e52ff9b80e10e5fdea0cdd3e1097810
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 2 15:11:16 2015 -0500

    fix whitespace; remove dead code
---
 src/or/main.c     |    2 --
 src/or/periodic.c |   12 ------------
 src/or/periodic.h |   21 ---------------------
 3 files changed, 35 deletions(-)

diff --git a/src/or/main.c b/src/or/main.c
index e0ea856..d5d4112 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1505,7 +1505,6 @@ run_scheduled_events(time_t now)
   /* 11b. check pending unconfigured managed proxies */
   if (!net_is_disabled() && pt_proxies_configuration_pending())
     pt_configure_remaining_proxies();
-
 }
 
 static int
@@ -1891,7 +1890,6 @@ expire_old_ciruits_serverside_callback(time_t now, const or_options_t *options)
   return 11;
 }
 
-
 static int
 check_dns_honesty_callback(time_t now, const or_options_t *options)
 {
diff --git a/src/or/periodic.c b/src/or/periodic.c
index 6fa1d8a..8ae8333 100644
--- a/src/or/periodic.c
+++ b/src/or/periodic.c
@@ -104,15 +104,3 @@ periodic_event_destroy(periodic_event_item_t *event)
   event->last_action_time = 0;
 }
 
-/** DOCDOC */
-void
-periodic_event_assert_in_range(periodic_event_item_t *ev,
-                               time_t start, time_t end)
-{
-  if (ev->last_action_time < start-1 || ev->last_action_time > end) {
-    log_err(LD_BUG, "[Refactor Bug] Missed an interval in a range,"
-            "Got %lu, wanted %lu <= x <= %lu.", ev->last_action_time,
-            start, end);
-    tor_assert(0);
-  }
-}
diff --git a/src/or/periodic.h b/src/or/periodic.h
index 3a73f64..2ab3db0 100644
--- a/src/or/periodic.h
+++ b/src/or/periodic.h
@@ -13,7 +13,6 @@
 typedef int (*periodic_event_helper_t)(time_t now,
                                       const or_options_t *options);
 
-
 /** A single item for the periodic-events-function table. */
 typedef struct periodic_event_item_t {
   periodic_event_helper_t fn; /**< The function to run the event */
@@ -27,26 +26,6 @@ typedef struct periodic_event_item_t {
 #define PERIODIC_EVENT(fn) { fn##_callback, 0, 0, NULL, #fn }
 #define END_OF_PERIODIC_EVENTS { NULL, 0, 0, NULL, NULL }
 
-#if 0
-/** Refactor test, check the last_action_time was now or (now - delta - 1)
-* It returns an incremented <b>now</b> value and accounts for the current
-* implementation's off by one error in it's comparisons. */
-#define INCREMENT_DELTA_AND_TEST(id, now, delta) \
-  (now+delta);                                   \
-  STMT_BEGIN \
-    periodic_event_item_t *ev = &periodic_events[id]; \
-    if (ev->last_action_time != now - delta - 1 && \
-        ev->last_action_time != now) { \
-      log_err(LD_BUG, "[Refactor Bug] Missed an interval " \
-        "for %s, Got %lu, wanted %lu or %lu.", ev->name, \
-        ev->last_action_time, now, now-delta); \
-      tor_assert(0); \
-    } \
-    STMT_END
-#endif
-
-void periodic_event_assert_in_range(periodic_event_item_t *event,
-                                    time_t start, time_t end);
 void periodic_event_launch(periodic_event_item_t *event);
 void periodic_event_destroy(periodic_event_item_t *event);
 void periodic_event_reschedule(periodic_event_item_t *event);