mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2025-02-24 22:58:50 +01:00
Tidy whitespace around some STMT_BEGINs and STMT_ENDs
This commit is contained in:
parent
1cdc030c3d
commit
339c18d6c7
4 changed files with 7 additions and 5 deletions
|
@ -4494,7 +4494,8 @@ options_validate(or_options_t *old_options, or_options_t *options,
|
||||||
or_options_free(dflt_options); \
|
or_options_free(dflt_options); \
|
||||||
REJECT(#arg " may only be changed in testing Tor " \
|
REJECT(#arg " may only be changed in testing Tor " \
|
||||||
"networks!"); \
|
"networks!"); \
|
||||||
} STMT_END
|
} \
|
||||||
|
STMT_END
|
||||||
|
|
||||||
/* Check for options that can only be changed from the defaults in testing
|
/* Check for options that can only be changed from the defaults in testing
|
||||||
networks. */
|
networks. */
|
||||||
|
|
|
@ -147,7 +147,7 @@ router_pick_dirserver_generic(smartlist_t *sourcelist,
|
||||||
try_ip_pref = 0; \
|
try_ip_pref = 0; \
|
||||||
goto retry_label; \
|
goto retry_label; \
|
||||||
} \
|
} \
|
||||||
STMT_END \
|
STMT_END
|
||||||
|
|
||||||
/* Common retry code for router_pick_directory_server_impl and
|
/* Common retry code for router_pick_directory_server_impl and
|
||||||
* router_pick_trusteddirserver_impl. Retry without excluding nodes, but with
|
* router_pick_trusteddirserver_impl. Retry without excluding nodes, but with
|
||||||
|
|
|
@ -635,7 +635,6 @@ setup_dir_formats_options(const char *arg, or_options_t *options)
|
||||||
STMT_BEGIN \
|
STMT_BEGIN \
|
||||||
tt_assert(r1); \
|
tt_assert(r1); \
|
||||||
tt_assert(rp1); \
|
tt_assert(rp1); \
|
||||||
\
|
|
||||||
tt_int_op(rp1->addr,OP_EQ, r1->addr); \
|
tt_int_op(rp1->addr,OP_EQ, r1->addr); \
|
||||||
tt_int_op(rp1->or_port,OP_EQ, r1->or_port); \
|
tt_int_op(rp1->or_port,OP_EQ, r1->or_port); \
|
||||||
tt_int_op(rp1->dir_port,OP_EQ, r1->dir_port); \
|
tt_int_op(rp1->dir_port,OP_EQ, r1->dir_port); \
|
||||||
|
|
|
@ -45,8 +45,10 @@
|
||||||
|
|
||||||
#define RESPONSE_LEN_4 8
|
#define RESPONSE_LEN_4 8
|
||||||
#define log_sock_error(act, _s) \
|
#define log_sock_error(act, _s) \
|
||||||
STMT_BEGIN log_fn(LOG_ERR, LD_NET, "Error while %s: %s", act, \
|
STMT_BEGIN \
|
||||||
tor_socket_strerror(tor_socket_errno(_s))); STMT_END
|
log_fn(LOG_ERR, LD_NET, "Error while %s: %s", act, \
|
||||||
|
tor_socket_strerror(tor_socket_errno(_s))); \
|
||||||
|
STMT_END
|
||||||
|
|
||||||
static void usage(void) ATTR_NORETURN;
|
static void usage(void) ATTR_NORETURN;
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue