commit 339c18d6c745208b939d3db08f7cd0f2a6504d7c Author: teor teor@torproject.org Date: Wed Oct 23 07:37:39 2019 +1000
Tidy whitespace around some STMT_BEGINs and STMT_ENDs --- src/app/config/config.c | 3 ++- src/feature/nodelist/node_select.c | 2 +- src/test/test_dir.c | 1 - src/tools/tor-resolve.c | 6 ++++-- 4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/app/config/config.c b/src/app/config/config.c index 337ae9357..68305aa65 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -4494,7 +4494,8 @@ options_validate(or_options_t *old_options, or_options_t *options, or_options_free(dflt_options); \ REJECT(#arg " may only be changed in testing Tor " \ "networks!"); \ - } STMT_END + } \ + STMT_END
/* Check for options that can only be changed from the defaults in testing networks. */ diff --git a/src/feature/nodelist/node_select.c b/src/feature/nodelist/node_select.c index 719b4b1b2..8ac0b664c 100644 --- a/src/feature/nodelist/node_select.c +++ b/src/feature/nodelist/node_select.c @@ -147,7 +147,7 @@ router_pick_dirserver_generic(smartlist_t *sourcelist, try_ip_pref = 0; \ goto retry_label; \ } \ - STMT_END \ + STMT_END
/* Common retry code for router_pick_directory_server_impl and * router_pick_trusteddirserver_impl. Retry without excluding nodes, but with diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 6329ff775..73a25dfed 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -635,7 +635,6 @@ setup_dir_formats_options(const char *arg, or_options_t *options) STMT_BEGIN \ tt_assert(r1); \ tt_assert(rp1); \ -\ tt_int_op(rp1->addr,OP_EQ, r1->addr); \ tt_int_op(rp1->or_port,OP_EQ, r1->or_port); \ tt_int_op(rp1->dir_port,OP_EQ, r1->dir_port); \ diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c index 5d97696c1..25bda2654 100644 --- a/src/tools/tor-resolve.c +++ b/src/tools/tor-resolve.c @@ -45,8 +45,10 @@
#define RESPONSE_LEN_4 8 #define log_sock_error(act, _s) \ - STMT_BEGIN log_fn(LOG_ERR, LD_NET, "Error while %s: %s", act, \ - tor_socket_strerror(tor_socket_errno(_s))); STMT_END + STMT_BEGIN \ + 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;