diff options
author | Nick Mathewson <nickm@torproject.org> | 2013-09-28 00:52:28 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2015-01-14 11:19:35 -0500 |
commit | cc6529e9bb7d7e01a25b5632d6d6c2424c6fc2b4 (patch) | |
tree | 1ea4ebcc33f65cd4300e75a4d001093cf8c49e2f | |
parent | e5f8c772f4c468a20da8b9176c2b276ac76bbe78 (diff) | |
download | tor-cc6529e9bb7d7e01a25b5632d6d6c2424c6fc2b4.tar.gz tor-cc6529e9bb7d7e01a25b5632d6d6c2424c6fc2b4.zip |
Fix check-spaces
-rw-r--r-- | src/common/compat_pthreads.c | 1 | ||||
-rw-r--r-- | src/common/compat_threads.c | 1 | ||||
-rw-r--r-- | src/common/compat_threads.h | 2 | ||||
-rw-r--r-- | src/common/compat_winthreads.c | 3 | ||||
-rw-r--r-- | src/common/workqueue.h | 1 | ||||
-rw-r--r-- | src/test/test.c | 1 | ||||
-rw-r--r-- | src/test/test_threads.c | 1 | ||||
-rw-r--r-- | src/test/test_workqueue.c | 8 |
8 files changed, 12 insertions, 6 deletions
diff --git a/src/common/compat_pthreads.c b/src/common/compat_pthreads.c index 69f7bac9c9..848bfe0973 100644 --- a/src/common/compat_pthreads.c +++ b/src/common/compat_pthreads.c @@ -240,3 +240,4 @@ tor_threads_init(void) set_main_thread(); } } + diff --git a/src/common/compat_threads.c b/src/common/compat_threads.c index f018475e18..79440070a2 100644 --- a/src/common/compat_threads.c +++ b/src/common/compat_threads.c @@ -253,3 +253,4 @@ alert_sockets_close(alert_sockets_t *socks) } socks->read_fd = socks->write_fd = -1; } + diff --git a/src/common/compat_threads.h b/src/common/compat_threads.h index a5db72d45f..acf3083f37 100644 --- a/src/common/compat_threads.h +++ b/src/common/compat_threads.h @@ -44,7 +44,6 @@ typedef struct tor_mutex_t { #endif } tor_mutex_t; - tor_mutex_t *tor_mutex_new(void); tor_mutex_t *tor_mutex_new_nonrecursive(void); void tor_mutex_init(tor_mutex_t *m); @@ -113,3 +112,4 @@ int alert_sockets_create(alert_sockets_t *socks_out, uint32_t flags); void alert_sockets_close(alert_sockets_t *socks); #endif + diff --git a/src/common/compat_winthreads.c b/src/common/compat_winthreads.c index 4820eb3481..71b994c4e4 100644 --- a/src/common/compat_winthreads.c +++ b/src/common/compat_winthreads.c @@ -33,7 +33,6 @@ spawn_func(void (*func)(void *), void *data) return 0; } - /** End the current thread/process. */ void @@ -46,7 +45,6 @@ spawn_exit(void) _exit(0); } - void tor_mutex_init(tor_mutex_t *m) { @@ -195,3 +193,4 @@ tor_threads_init(void) { set_main_thread(); } + diff --git a/src/common/workqueue.h b/src/common/workqueue.h index ec1f7c9000..aa8620ddb7 100644 --- a/src/common/workqueue.h +++ b/src/common/workqueue.h @@ -45,3 +45,4 @@ tor_socket_t replyqueue_get_socket(replyqueue_t *rq); void replyqueue_process(replyqueue_t *queue); #endif + diff --git a/src/test/test.c b/src/test/test.c index 9171306d18..2c2328c197 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1258,7 +1258,6 @@ test_stats(void *arg) tor_free(s); } - static void * passthrough_test_setup(const struct testcase_t *testcase) { diff --git a/src/test/test_threads.c b/src/test/test_threads.c index 2bc24e1edc..c0293048fe 100644 --- a/src/test/test_threads.c +++ b/src/test/test_threads.c @@ -313,3 +313,4 @@ struct testcase_t thread_tests[] = { &passthrough_setup, (void*)"tv" }, END_OF_TESTCASES }; + diff --git a/src/test/test_workqueue.c b/src/test/test_workqueue.c index 6de6f03c33..410f43cce4 100644 --- a/src/test/test_workqueue.c +++ b/src/test/test_workqueue.c @@ -293,9 +293,12 @@ replysock_readable_cb(tor_socket_t sock, short what, void *arg) add_n_work_items(tp, n_to_send); } - if (shutting_down == 0 && n_received+n_successful_cancel == n_sent && n_sent >= opt_n_items) { + if (shutting_down == 0 && + n_received+n_successful_cancel == n_sent && + n_sent >= opt_n_items) { shutting_down = 1; - threadpool_queue_for_all(tp, NULL, workqueue_do_shutdown, shutdown_reply, NULL); + threadpool_queue_for_all(tp, NULL, + workqueue_do_shutdown, shutdown_reply, NULL); } } @@ -416,3 +419,4 @@ main(int argc, char **argv) return 0; } } + |