aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-11-05 12:01:29 +1000
committerteor <teor@torproject.org>2019-11-05 12:01:29 +1000
commit8b91fa707573e59dedaa09afdbcbf766e57ff750 (patch)
tree48c9a65244c2a5c47708d6a57f39b1054acc3966 /src
parent81972353cbd129984b7cf519bc10a726592793b3 (diff)
downloadtor-8b91fa707573e59dedaa09afdbcbf766e57ff750.tar.gz
tor-8b91fa707573e59dedaa09afdbcbf766e57ff750.zip
config: Run "make autostyle"
Part of 32213.
Diffstat (limited to 'src')
-rw-r--r--src/app/config/config.c2
-rw-r--r--src/feature/dirauth/dirauth_config.h2
-rw-r--r--src/feature/relay/relay_config.h6
-rw-r--r--src/feature/relay/transport_config.h6
-rw-r--r--src/test/test_options.c4
5 files changed, 10 insertions, 10 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c
index 108786fb64..1b697e73fc 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -2951,7 +2951,7 @@ options_validate(const or_options_t *old_options, or_options_t *options,
vs = config_validate(get_options_mgr(), old_options, options, msg);
return vs < 0 ? -1 : 0;
}
-#endif
+#endif /* defined(TOR_UNIT_TESTS) */
#define REJECT(arg) \
STMT_BEGIN *msg = tor_strdup(arg); return -1; STMT_END
diff --git a/src/feature/dirauth/dirauth_config.h b/src/feature/dirauth/dirauth_config.h
index fbe4ec1a52..655ab0a7fa 100644
--- a/src/feature/dirauth/dirauth_config.h
+++ b/src/feature/dirauth/dirauth_config.h
@@ -39,7 +39,7 @@ int options_act_dirauth_mtbf(const or_options_t *old_options);
int options_act_dirauth_stats(const or_options_t *old_options,
bool *print_notice_out);
-#else
+#else /* !defined(HAVE_MODULE_DIRAUTH) */
/** When tor is compiled with the dirauth module disabled, it can't be
* configured as a directory authority.
diff --git a/src/feature/relay/relay_config.h b/src/feature/relay/relay_config.h
index c0d7d41240..214f07efc2 100644
--- a/src/feature/relay/relay_config.h
+++ b/src/feature/relay/relay_config.h
@@ -88,9 +88,9 @@ STATIC int check_bridge_distribution_setting(const char *bd);
STATIC int have_enough_mem_for_dircache(const or_options_t *options,
size_t total_mem, char **msg);
-#endif
+#endif /* defined(RELAY_CONFIG_PRIVATE) */
-#else
+#else /* !defined(HAVE_MODULE_RELAY) */
#include "lib/cc/compat_compiler.h"
@@ -183,6 +183,6 @@ options_validate_relay_mode(const or_options_t *old_options,
#define options_act_relay_dir(old_options) \
(((void)(old_options)),0)
-#endif
+#endif /* defined(HAVE_MODULE_RELAY) */
#endif /* !defined(TOR_FEATURE_RELAY_RELAY_CONFIG_H) */
diff --git a/src/feature/relay/transport_config.h b/src/feature/relay/transport_config.h
index de6e7668e2..d3cceb3698 100644
--- a/src/feature/relay/transport_config.h
+++ b/src/feature/relay/transport_config.h
@@ -34,9 +34,9 @@ STATIC smartlist_t *get_options_from_transport_options_line(
const char *line,
const char *transport);
-#endif
+#endif /* defined(RELAY_TRANSPORT_CONFIG_PRIVATE) */
-#else
+#else /* !defined(HAVE_MODULE_RELAY) */
/** When tor is compiled with the relay module disabled, it can't be
* configured with server pluggable transports.
@@ -80,6 +80,6 @@ options_validate_server_transport(const or_options_t *old_options,
#define options_act_server_transport(old_options) \
(((void)(old_options)),0)
-#endif
+#endif /* defined(HAVE_MODULE_RELAY) */
#endif /* !defined(TOR_FEATURE_RELAY_TRANSPORT_CONFIG_H) */
diff --git a/src/test/test_options.c b/src/test/test_options.c
index 8e673c09f6..c06fb998fb 100644
--- a/src/test/test_options.c
+++ b/src/test/test_options.c
@@ -112,7 +112,7 @@ clear_log_messages(void)
#define ENABLE_AUTHORITY_V3 ""
#define ENABLE_AUTHORITY_BRIDGE ""
-#else
+#else /* !defined(COCCI) */
#define ENABLE_AUTHORITY_MIN \
"AuthoritativeDirectory 1\n"
@@ -144,7 +144,7 @@ clear_log_messages(void)
ENABLE_AUTHORITY_BRIDGE_MIN \
AUTHORITY_OPT_REQ_
-#endif
+#endif /* defined(COCCI) */
#define VALID_DIR_AUTH "DirAuthority dizum orport=443 v3ident=E8A9C45" \
"EDE6D711294FADF8E7951F4DE6CA56B58 194.109.206.212:80 7EA6 EAD6 FD83" \