From: teor <teor@torproject.org>
Date: Tue, 17 Mar 2020 07:43:02 +0000 (+1000)
Subject: relay: Run "make autostyle"
X-Git-Tag: tor-0.4.5.0-alpha-dev~60^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cb262930f5b028bfa5297b4a0199aead66d35f0a;p=thirdparty%2Ftor.git

relay: Run "make autostyle"

But only take the changes from the relay module.

Part of 33633.
---

diff --git a/src/feature/relay/circuitbuild_relay.h b/src/feature/relay/circuitbuild_relay.h
index 19dbc4b943..d14f304f1c 100644
--- a/src/feature/relay/circuitbuild_relay.h
+++ b/src/feature/relay/circuitbuild_relay.h
@@ -41,7 +41,7 @@ int onionskin_answer(struct or_circuit_t *circ,
                      const char *keys, size_t keys_len,
                      const uint8_t *rend_circ_nonce);
 
-#else
+#else /* !defined(HAVE_MODULE_RELAY) */
 
 static inline int
 circuit_extend(struct cell_t *cell, struct circuit_t *circ)
@@ -67,7 +67,7 @@ onionskin_answer(struct or_circuit_t *circ,
   return -1;
 }
 
-#endif
+#endif /* defined(HAVE_MODULE_RELAY) */
 
 #ifdef TOR_UNIT_TESTS
 
@@ -79,6 +79,6 @@ STATIC void circuit_open_connection_for_extend(const struct extend_cell_t *ec,
                                                struct circuit_t *circ,
                                                int should_launch);
 
-#endif
+#endif /* defined(TOR_UNIT_TESTS) */
 
 #endif /* !defined(TOR_FEATURE_RELAY_CIRCUITBUILD_RELAY_H) */