commit d19f370aa2dbffe72587b6af9f7119a36ea7c25a Author: teor teor@torproject.org Date: Thu Nov 14 16:28:39 2019 +1000

Run "make autostyle" --- src/app/main/subsysmgr.c | 2 +- src/feature/relay/relay_periodic.h | 4 ++-- src/lib/conf/confdecl.h | 2 +- src/lib/crypt_ops/crypto_openssl_mgt.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/app/main/subsysmgr.c b/src/app/main/subsysmgr.c index 8be4a7d75..ca23b5df9 100644 --- a/src/app/main/subsysmgr.c +++ b/src/app/main/subsysmgr.c @@ -385,7 +385,7 @@ subsystems_get_state_idx(const subsys_fns_t *sys) tor_assert(i >= 0); return sys_status[i].state_idx; } -#endif +#endif /* defined(TOR_UNIT_TESTS) */

/** * Call all appropriate set_options() methods to tell the various subsystems diff --git a/src/feature/relay/relay_periodic.h b/src/feature/relay/relay_periodic.h index 8da5b536a..84bc8a978 100644 --- a/src/feature/relay/relay_periodic.h +++ b/src/feature/relay/relay_periodic.h @@ -17,7 +17,7 @@ void relay_register_periodic_events(void); void reschedule_descriptor_update_check(void);

-#else +#else /* !defined(HAVE_MODULE_RELAY) */

#include "lib/cc/compat_compiler.h"

@@ -26,6 +26,6 @@ void reschedule_descriptor_update_check(void); #define reschedule_descriptor_update_check() \ STMT_NIL

-#endif +#endif /* defined(HAVE_MODULE_RELAY) */

#endif /* !defined(TOR_FEATURE_RELAY_RELAY_PERIODIC_H) */ diff --git a/src/lib/conf/confdecl.h b/src/lib/conf/confdecl.h index 26c71e1d4..294a1e717 100644 --- a/src/lib/conf/confdecl.h +++ b/src/lib/conf/confdecl.h @@ -134,7 +134,7 @@ .initvalue = initval \ }, /**@}*/ -#endif +#endif /* !defined(COCCI) */

/** Type aliases for the "commonly used" configuration types. * diff --git a/src/lib/crypt_ops/crypto_openssl_mgt.c b/src/lib/crypt_ops/crypto_openssl_mgt.c index 20c61696c..e867012f4 100644 --- a/src/lib/crypt_ops/crypto_openssl_mgt.c +++ b/src/lib/crypt_ops/crypto_openssl_mgt.c @@ -296,7 +296,7 @@ crypto_openssl_init_engines(const char *accelName, return -1; } return 0; -#else +#else /* !defined(DISABLE_ENGINES) */ ENGINE *e = NULL;

log_info(LD_CRYPTO, "Initializing OpenSSL engine support.");