[tor-commits] [tor/master] relay: Re-order selftest header

[nickm at torproject.org]

commit 07280c567e4afa9a74f203fbd22cc2cfcc34f875
Author: teor <teor at torproject.org>
Date:   Tue Mar 17 16:10:49 2020 +1000

    relay: Re-order selftest header
    
    The selftest header declares functions, and stubs for when the relay
    module is disabled. Put the functions and stubs in the same order.
    
    Part of 33633.
---
 src/feature/relay/selftest.h | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/feature/relay/selftest.h b/src/feature/relay/selftest.h
index f3dd698bb..ffe06eda6 100644
--- a/src/feature/relay/selftest.h
+++ b/src/feature/relay/selftest.h
@@ -13,14 +13,17 @@
 #define TOR_SELFTEST_H
 
 #ifdef HAVE_MODULE_RELAY
+
 struct or_options_t;
 int check_whether_orport_reachable(const struct or_options_t *options);
 int check_whether_dirport_reachable(const struct or_options_t *options);
 
 void router_do_reachability_checks(int test_or, int test_dir);
+void router_perform_bandwidth_test(int num_circs, time_t now);
+
 void router_orport_found_reachable(void);
 void router_dirport_found_reachable(void);
-void router_perform_bandwidth_test(int num_circs, time_t now);
+
 void router_reset_reachability(void);
 
 #else /* !defined(HAVE_MODULE_RELAY) */
@@ -30,13 +33,6 @@ void router_reset_reachability(void);
 #define check_whether_dirport_reachable(opts) \
   ((void)(opts), 0)
 
-#define router_orport_found_reachable() \
-  STMT_NIL
-#define router_dirport_found_reachable() \
-  STMT_NIL
-#define router_reset_reachability() \
-  STMT_NIL
-
 static inline void
 router_do_reachability_checks(int test_or, int test_dir)
 {
@@ -52,6 +48,14 @@ router_perform_bandwidth_test(int num_circs, time_t now)
   tor_assert_nonfatal_unreached();
 }
 
+#define router_orport_found_reachable() \
+  STMT_NIL
+#define router_dirport_found_reachable() \
+  STMT_NIL
+
+#define router_reset_reachability() \
+  STMT_NIL
+
 #endif /* defined(HAVE_MODULE_RELAY) */
 
 #endif /* !defined(TOR_SELFTEST_H) */