Run "make autostyle".

diff --git a/src/feature/dirauth/process_descs.h b/src/feature/dirauth/process_descs.h
index 55b828ba64e7226c7c1dd725961a910ef2bae6ec..9c136927782f66d17f925cd8edfbab05c7c653d2 100644 (file)
--- a/src/feature/dirauth/process_descs.h
+++ b/src/feature/dirauth/process_descs.h
@@ -15,7 +15,7 @@
 // for was_router_added_t.
 #include "feature/nodelist/routerlist.h"
 
-#include "src/lib/crypt_ops/crypto_ed25519.h"
+#include "lib/crypt_ops/crypto_ed25519.h"
 
 struct authdir_config_t;
 
@@ -47,7 +47,7 @@ typedef struct authdir_config_t {
 #define RTR_BADEXIT 16 /**< We'll tell clients not to use this as an exit. */
 /*                 32 Historically used to indicade Unnamed */
 
-#endif /* defined(TOR_UNIT_TESTS) */
+#endif /* defined(PROCESS_DESCS_PRIVATE) || defined(TOR_UNIT_TESTS) */
 
 #ifdef TOR_UNIT_TESTS
 
@@ -55,7 +55,7 @@ void authdir_init_fingerprint_list(void);
 
 authdir_config_t *authdir_return_fingerprint_list(void);
 
-#endif /* defined(PROCESS_DESCS_PRIVATE) || defined(TOR_UNIT_TESTS) */
+#endif /* defined(TOR_UNIT_TESTS) */
 
 void dirserv_free_fingerprint_list(void);
 

diff --git a/src/feature/dircache/dirserv.h b/src/feature/dircache/dirserv.h
index 3a168c203593b477c7b6043e6dfe5d15c882f176..73a64b1b7e62142ab06cff32c0b79262bdab834b 100644 (file)
--- a/src/feature/dircache/dirserv.h
+++ b/src/feature/dircache/dirserv.h
@@ -93,7 +93,7 @@ void dirserv_set_cached_consensus_networkstatus(const char *consensus,
                                               const common_digests_t *digests,
                                               const uint8_t *sha3_as_signed,
                                               time_t published);
-#else
+#else /* !defined(HAVE_MODULE_DIRCACHE) */
 #define have_module_dircache() (0)
 #define directory_caches_unknown_auth_certs(opt) \
   ((void)(opt), 0)
@@ -112,7 +112,7 @@ void dirserv_set_cached_consensus_networkstatus(const char *consensus,
     (void)(e);                                                  \
     (void)(f);                                                  \
   } STMT_END
-#endif
+#endif /* defined(HAVE_MODULE_DIRCACHE) */
 
 void dirserv_clear_old_networkstatuses(time_t cutoff);
 int dirserv_get_routerdesc_spool(smartlist_t *spools_out, const char *key,

diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c
index 0d2ff96a6e50e649bedb8fb46849d95e015c6253..cc4b8e1c3441417a9ab891e20c711d33e9c8c5a3 100644 (file)
--- a/src/feature/nodelist/networkstatus.c
+++ b/src/feature/nodelist/networkstatus.c
@@ -102,7 +102,7 @@
 #include "feature/nodelist/routerlist_st.h"
 #include "feature/dirauth/vote_microdesc_hash_st.h"
 #include "feature/nodelist/vote_routerstatus_st.h"
-#include "routerstatus_st.h"
+#include "feature/nodelist/routerstatus_st.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

diff --git a/src/lib/cc/compat_compiler.h b/src/lib/cc/compat_compiler.h
index 907622f942d29a8a38cea5e8333073d0a12afa76..1bb8c54a0c84febe6d62ade7a0aac80396b483d6 100644 (file)
--- a/src/lib/cc/compat_compiler.h
+++ b/src/lib/cc/compat_compiler.h
@@ -238,6 +238,6 @@
 #define POSSIBLE(expr) ((expr) || getenv("STATIC_ANALYZER_DEADCODE_DUMMY_"))
 #else
 #define POSSIBLE(expr) (expr)
-#endif
+#endif /* defined(__COVERITY__) || defined(__clang_analyzer__) */
 
 #endif /* !defined(TOR_COMPAT_COMPILER_H) */

diff --git a/src/test/test_util.c b/src/test/test_util.c
index 07c31f02d6bf93e0aad76d1c5572a1df39ac92a5..0d86a5ab5db34ffdab6d9a86263cb464d4a2e7c0 100644 (file)
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -1947,7 +1947,7 @@ test_util_expand_filename(void *arg)
  done:
   tor_free(str);
 }
-#endif /* !defined(_WIN32) */
+#endif /* !defined(DISABLE_PWDB_TESTS) */
 
 /** Test tor_escape_str_for_pt_args(). */
 static void
@@ -5763,7 +5763,7 @@ test_util_pwdb(void *arg)
   tor_free(dir);
   teardown_capture_of_logs();
 }
-#endif /* !(defined(_WIN32) || defined (__ANDROID__)) */
+#endif /* !defined(DISABLE_PWDB_TESTS) */
 
 static void
 test_util_calloc_check(void *arg)