[tor-commits] [tor/master] Fix check-spaces

[nickm@xxxxxxxxxxxxxx]

commit cc6529e9bb7d7e01a25b5632d6d6c2424c6fc2b4
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Sat Sep 28 00:52:28 2013 -0400

    Fix check-spaces
---
 src/common/compat_pthreads.c   |    1 +
 src/common/compat_threads.c    |    1 +
 src/common/compat_threads.h    |    2 +-
 src/common/compat_winthreads.c |    3 +--
 src/common/workqueue.h         |    1 +
 src/test/test.c                |    1 -
 src/test/test_threads.c        |    1 +
 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 69f7bac..848bfe0 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 f018475..7944007 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 a5db72d..acf3083 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 4820eb3..71b994c 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 ec1f7c9..aa8620d 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 9171306..2c2328c 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 2bc24e1..c029304 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 6de6f03..410f43c 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;
   }
 }
+



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits