commit cbc1b8a4f75d449a0843451954568e0c8498821e Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 20 10:52:56 2015 -0500

fix "make check-spaces" --- src/common/compat.c | 2 +- src/or/connection_edge.c | 1 + src/or/policies.c | 4 +--- src/test/test_policy.c | 10 ++++++---- 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/common/compat.c b/src/common/compat.c index 24698c3..bd59e0f 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1568,7 +1568,7 @@ tor_ersatz_socketpair(int family, int type, int protocol, tor_socket_t fd[2]) tor_addr_to_sockaddr(&listen_tor_addr, 0 /* kernel chooses port. */, &listen_addr, - sizeof (listen_addr)); + sizeof(listen_addr)); if (bind(listener, &listen_addr, sizeof (listen_addr)) == -1) goto tidy_up_and_fail; if (listen(listener, 1) == -1) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 67e594a..aad1ea4 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -3598,3 +3598,4 @@ connection_edge_free_all(void) smartlist_free(pending_entry_connections); pending_entry_connections = NULL; } + diff --git a/src/or/policies.c b/src/or/policies.c index d588a80..4d9b17c 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -901,7 +901,6 @@ addr_policy_append_reject_addr(smartlist_t **dest, const tor_addr_t *addr) smartlist_add(*dest, add); log_debug(LD_CONFIG, "Adding a reject ExitPolicy 'reject %s:*'", fmt_addr(addr)); - }

/* Is addr public for the purposes of rejection? */ @@ -1309,7 +1308,6 @@ policies_add_outbound_addresses_to_smartlist(smartlist_t *addr_list, } }

- /** Parse <b>ExitPolicy</b> member of <b>or_options</b> into <b>result</b> * smartlist. * If <b>or_options->IPv6Exit</b> is false, prepend an entry that @@ -2103,7 +2101,7 @@ policy_dump_to_string(const smartlist_t *policy_list,

policy_string = smartlist_join_strings(policy_string_list, "\n", 0, NULL);

-done: + done: SMARTLIST_FOREACH(policy_string_list, char *, str, tor_free(str)); smartlist_free(policy_string_list);

diff --git a/src/test/test_policy.c b/src/test/test_policy.c index 4cf56c8..52360f3 100644 --- a/src/test/test_policy.c +++ b/src/test/test_policy.c @@ -681,7 +681,7 @@ test_policies_reject_port_address(void *arg) addr_policy_list_free(policy); policy = NULL;

-done: + done: addr_policy_list_free(policy); if (test_configured_ports) { SMARTLIST_FOREACH(test_configured_ports, @@ -826,7 +826,8 @@ test_dump_exit_policy_to_string(void *arg) }

static routerinfo_t *mock_desc_routerinfo = NULL; -static const routerinfo_t *mock_router_get_my_routerinfo(void) +static const routerinfo_t * +mock_router_get_my_routerinfo(void) { return mock_desc_routerinfo; } @@ -948,7 +949,7 @@ test_policies_getinfo_helper_policies(void *arg) tt_assert(strlen(answer) == ipv4_len + ipv6_len + 1); tor_free(answer);

-done: + done: tor_free(answer); UNMOCK(get_options); UNMOCK(router_get_my_routerinfo); @@ -966,7 +967,8 @@ struct testcase_t policy_tests[] = { { "getinfo_helper_policies", test_policies_getinfo_helper_policies, 0, NULL, NULL }, { "reject_exit_address", test_policies_reject_exit_address, 0, NULL, NULL }, - { "reject_interface_address", test_policies_reject_interface_address, 0, NULL, NULL }, + { "reject_interface_address", test_policies_reject_interface_address, 0, + NULL, NULL }, { "reject_port_address", test_policies_reject_port_address, 0, NULL, NULL }, END_OF_TESTCASES };