commit 5cf24ff3af046391dcaf1df636e3bd5d7d17573d Author: Sebastian Hahn sebastian@torproject.org Date: Thu Aug 20 20:28:47 2015 +0200

Fix a bunch of check-spaces complaints --- src/common/compat.c | 1 + src/common/container.h | 3 ++- src/or/control.c | 1 + src/or/rendcache.c | 2 +- src/or/rendclient.c | 9 +++++---- src/test/test_util.c | 1 - src/test/test_workqueue.c | 3 ++- 7 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/common/compat.c b/src/common/compat.c index 76f9bcb..7d72b4b 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -3424,3 +3424,4 @@ tor_get_avail_disk_space(const char *path) return -1; #endif } + diff --git a/src/common/container.h b/src/common/container.h index 5abd8b4..bf4f047 100644 --- a/src/common/container.h +++ b/src/common/container.h @@ -110,7 +110,8 @@ void smartlist_sort_digests256(smartlist_t *sl); void smartlist_sort_pointers(smartlist_t *sl);

const char *smartlist_get_most_frequent_string(smartlist_t *sl); -const char *smartlist_get_most_frequent_string_(smartlist_t *sl, int *count_out); +const char *smartlist_get_most_frequent_string_(smartlist_t *sl, + int *count_out); const uint8_t *smartlist_get_most_frequent_digest256(smartlist_t *sl);

void smartlist_uniq_strings(smartlist_t *sl); diff --git a/src/or/control.c b/src/or/control.c index 3638bd2..44b19d7 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -6478,3 +6478,4 @@ control_testing_set_global_event_mask(uint64_t mask) global_event_mask = mask; } #endif + diff --git a/src/or/rendcache.c b/src/or/rendcache.c index 9a33046..fe9a134 100644 --- a/src/or/rendcache.c +++ b/src/or/rendcache.c @@ -330,7 +330,7 @@ cache_failure_intro_lookup(const uint8_t *identity, const char *service_id, *intro_entry = intro_elem; } return 1; -not_found: + not_found: return 0; }

diff --git a/src/or/rendclient.c b/src/or/rendclient.c index c6f29a7..a39e518 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -1021,7 +1021,7 @@ rend_client_report_intro_point_failure(extend_info_t *failed_intro, /* fall through */ case INTRO_POINT_FAILURE_GENERIC: rend_cache_intro_failure_note(failure_type, - (uint8_t *) failed_intro->identity_digest, + (uint8_t *)failed_intro->identity_digest, rend_query->onion_address); rend_intro_point_free(intro); smartlist_del(ent->parsed->intro_nodes, i); @@ -1038,9 +1038,10 @@ rend_client_report_intro_point_failure(extend_info_t *failed_intro, intro->unreachable_count, zap_intro_point ? " Removing from descriptor.": ""); if (zap_intro_point) { - rend_cache_intro_failure_note(failure_type, - (uint8_t *) failed_intro->identity_digest, - rend_query->onion_address); + rend_cache_intro_failure_note( + failure_type, + (uint8_t *) failed_intro->identity_digest, + rend_query->onion_address); rend_intro_point_free(intro); smartlist_del(ent->parsed->intro_nodes, i); } diff --git a/src/test/test_util.c b/src/test/test_util.c index 8b4513d..0a5783e 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -3654,7 +3654,6 @@ test_util_di_map(void *arg) dimap_free(dimap, tor_free_); }

- /** * Test counting high bits */ diff --git a/src/test/test_workqueue.c b/src/test/test_workqueue.c index b6a10bb..0d79733 100644 --- a/src/test/test_workqueue.c +++ b/src/test/test_workqueue.c @@ -306,7 +306,8 @@ replysock_readable_cb(tor_socket_t sock, short what, void *arg) threadpool_queue_update(tp, NULL, workqueue_do_shutdown, NULL, NULL); // Anything we add after starting the shutdown must not be executed. - threadpool_queue_work(tp, workqueue_shutdown_error, handle_reply_shutdown, NULL); + threadpool_queue_work(tp, workqueue_shutdown_error, + handle_reply_shutdown, NULL); { struct timeval limit = { 2, 0 }; tor_event_base_loopexit(tor_libevent_get_base(), &limit);