nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 15:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

config: Run "make autostyle"

Browse Source 
Part of 32213.
This commit is contained in:
teor 2019-11-05 12:01:29 +10:00
parent 81972353cb
commit 8b91fa7075
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/config/config.c
View File

@ -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); vs = config_validate(get_options_mgr(), old_options, options, msg);
return vs < 0 ? -1 : 0; return vs < 0 ? -1 : 0;
} }
#endif #endif /* defined(TOR_UNIT_TESTS) */
#define REJECT(arg) \ #define REJECT(arg) \
STMT_BEGIN *msg = tor_strdup(arg); return -1; STMT_END STMT_BEGIN *msg = tor_strdup(arg); return -1; STMT_END

2
src/feature/dirauth/dirauth_config.h
View File

@ -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, int options_act_dirauth_stats(const or_options_t *old_options,
bool *print_notice_out); bool *print_notice_out);
#else #else /* !defined(HAVE_MODULE_DIRAUTH) */
/** When tor is compiled with the dirauth module disabled, it can't be /** When tor is compiled with the dirauth module disabled, it can't be
* configured as a directory authority. * configured as a directory authority.

6
src/feature/relay/relay_config.h
View File

@ -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, STATIC int have_enough_mem_for_dircache(const or_options_t *options,
size_t total_mem, char **msg); size_t total_mem, char **msg);
#endif #endif /* defined(RELAY_CONFIG_PRIVATE) */
#else #else /* !defined(HAVE_MODULE_RELAY) */
#include "lib/cc/compat_compiler.h" #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) \ #define options_act_relay_dir(old_options) \
(((void)(old_options)),0) (((void)(old_options)),0)
#endif #endif /* defined(HAVE_MODULE_RELAY) */
#endif /* !defined(TOR_FEATURE_RELAY_RELAY_CONFIG_H) */ #endif /* !defined(TOR_FEATURE_RELAY_RELAY_CONFIG_H) */

6
src/feature/relay/transport_config.h
View File

@ -34,9 +34,9 @@ STATIC smartlist_t *get_options_from_transport_options_line(
const char *line, const char *line,
const char *transport); 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 /** When tor is compiled with the relay module disabled, it can't be
* configured with server pluggable transports. * 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) \ #define options_act_server_transport(old_options) \
(((void)(old_options)),0) (((void)(old_options)),0)
#endif #endif /* defined(HAVE_MODULE_RELAY) */
#endif /* !defined(TOR_FEATURE_RELAY_TRANSPORT_CONFIG_H) */ #endif /* !defined(TOR_FEATURE_RELAY_TRANSPORT_CONFIG_H) */

4
src/test/test_options.c
View File

@ -112,7 +112,7 @@ clear_log_messages(void)
#define ENABLE_AUTHORITY_V3 "" #define ENABLE_AUTHORITY_V3 ""
#define ENABLE_AUTHORITY_BRIDGE "" #define ENABLE_AUTHORITY_BRIDGE ""
#else #else /* !defined(COCCI) */
#define ENABLE_AUTHORITY_MIN \ #define ENABLE_AUTHORITY_MIN \
"AuthoritativeDirectory 1\n" "AuthoritativeDirectory 1\n"
@ -144,7 +144,7 @@ clear_log_messages(void)
ENABLE_AUTHORITY_BRIDGE_MIN \ ENABLE_AUTHORITY_BRIDGE_MIN \
AUTHORITY_OPT_REQ_ AUTHORITY_OPT_REQ_
#endif #endif /* defined(COCCI) */
#define VALID_DIR_AUTH "DirAuthority dizum orport=443 v3ident=E8A9C45" \ #define VALID_DIR_AUTH "DirAuthority dizum orport=443 v3ident=E8A9C45" \
"EDE6D711294FADF8E7951F4DE6CA56B58 194.109.206.212:80 7EA6 EAD6 FD83" \ "EDE6D711294FADF8E7951F4DE6CA56B58 194.109.206.212:80 7EA6 EAD6 FD83" \