Renormalize whitespace

svn:r3757

diff --git a/src/common/compat.c b/src/common/compat.c
index 7667dd3541834a42409b6f7da62be9143eb0a79b..c3c3ca2a0a6d681e990cb767f86842fb97be03fb 100644 (file)
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -767,7 +767,6 @@ void tor_gettimeofday(struct timeval *timeval) {
   return;
 }
 
-
 #if defined(TOR_IS_MULTITHREADED) && !defined(MS_WINDOWS)
 #define TIME_FNS_NEED_LOCKS
 #endif

diff --git a/src/common/compat.h b/src/common/compat.h
index 801f1893f23ad3582c65a335ea7ad82991ff152a..fbb44d0fa411152b74d83612299ef7cb34dd9aa3 100644 (file)
--- a/src/common/compat.h
+++ b/src/common/compat.h
@@ -206,7 +206,6 @@ char *get_user_homedir(const char *username);
 int spawn_func(int (*func)(void *), void *data);
 void spawn_exit(void);
 
-
 #if defined(MS_WINDOWS)
 #define USE_WIN32_THREADS
 #define TOR_IS_MULTITHREADED 1
@@ -230,10 +229,8 @@ unsigned long tor_get_thread_id(void);
 #define tor_mutex_new() ((tor_mutex_t*)tor_malloc(sizeof(int)))
 #define tor_mutex_acquire(m) do { } while (0)
 #define tor_mutex_release(m) do { } while (0)
-#define tor_mutex_free(m) do { tor_free(m); } while(0)
+#define tor_mutex_free(m) do { tor_free(m); } while (0)
 #define tor_get_thread_id() (1UL)
 #endif
 
-
 #endif
-

diff --git a/src/or/buffers.c b/src/or/buffers.c
index 92cac0030f5b5e32df629a5db1b02fc151a9c249..34ee95d7d00df6a037562e1d7cfee6eccb67ac8b 100644 (file)
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -645,7 +645,6 @@ int fetch_from_buf_socks(buf_t *buf, socks_request_t *req) {
   }
 }
 
-
 #define CONTROL_CMD_FRAGMENTHEADER 0x0010
 #define CONTROL_CMD_FRAGMENT       0x0011
 /** If there is a complete control message waiting on buf, then store
@@ -759,4 +758,3 @@ void assert_buf_ok(buf_t *buf)
   tor_assert(buf->mem);
   tor_assert(buf->datalen <= buf->len);
 }
-

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index c6015a1aaf7bbe13dc87ff907787eba0a39ca5ba..ddc40559e30543356f56207a2b10e13b19c4dce1 100644 (file)
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -1355,4 +1355,3 @@ onion_extend_cpath(crypt_path_t **head_ptr, cpath_build_state_t
   *router_out = choice;
   return 0;
 }
-

diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index fafeadcd10d3a8bb9c1e1653a3f75e94d6b53fb7..74fea1ed2d216bc8af57399524738d614ce1ce55 100644 (file)
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -548,7 +548,7 @@ circuit_testing_opened(circuit_t *circ) {
   /* For now, we only use testing circuits to see if our ORPort is
      reachable. So, if this circuit ends at us, remember that. */
   routerinfo_t *exit = router_get_by_digest(circ->build_state->chosen_exit_digest);
-  if(exit && router_is_me(exit)) {
+  if (exit && router_is_me(exit)) {
     log_fn(LOG_NOTICE,"Your ORPort is reachable from the outside. Excellent.");
     router_orport_found_reachable();
   }
@@ -1009,7 +1009,6 @@ connection_ap_handshake_attach_chosen_circuit(connection_t *conn,
   return 1;
 }
 
-
 /** Try to find a safe live circuit for CONN_TYPE_AP connection conn. If
  * we don't find one: if conn cannot be handled by any known nodes,
  * warn and return -1 (conn needs to die);
@@ -1133,4 +1132,3 @@ int connection_ap_handshake_attach_circuit(connection_t *conn) {
     return 0;
   }
 }
-

diff --git a/src/or/connection.c b/src/or/connection.c
index 52fb694f4741947b875d39166bc51cd01ce0479f..4f95f10be4a3f0e258f38266c335c68afb21f32b 100644 (file)
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1243,7 +1243,6 @@ connection_t *connection_get_by_identity_digest(const char *digest, int type)
   return best;
 }
 
-
 /** Return the connection with id <b>id</b> if it is not already
  * marked for close.
  */
@@ -1266,7 +1265,6 @@ connection_get_by_global_id(uint32_t id) {
   return NULL;
 }
 
-
 /** Return a connection of type <b>type</b> that is not marked for
  * close.
  */
@@ -1675,4 +1673,3 @@ void assert_connection_ok(connection_t *conn, time_t now)
       tor_assert(0);
   }
 }
-

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index cb3b6519949c997c0aa6bd74243a555213212ada..fe77f4366971645e385ae4c8112cdcb8b7fdc62e 100644 (file)
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -172,7 +172,6 @@ connection_edge_end_errno(connection_t *conn, crypt_path_t *cpath_layer)
   return connection_edge_end(conn, reason, cpath_layer);
 }
 
-
 /** Connection <b>conn</b> has finished writing and has no bytes left on
  * its outbuf.
  *
@@ -358,7 +357,6 @@ connection_ap_detach_retriable(connection_t *conn, circuit_t *circ)
   }
 }
 
-
 /** A client-side struct to remember requests to rewrite addresses
  * to new addresses. These structs make up a tree, with addressmap
  * below as its root.

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 48cee77c373c53397fc5d9518711ebfa6e50b818..1b465c15b53b7973a44ad85779fdbe3cd1f8763f 100644 (file)
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -107,7 +107,7 @@ int connection_or_process_inbuf(connection_t *conn) {
   tor_assert(conn);
   tor_assert(conn->type == CONN_TYPE_OR);
 
-  switch(conn->state) {
+  switch (conn->state) {
     case OR_CONN_STATE_PROXY_READING:
       return connection_or_read_proxy_response(conn);
     case OR_CONN_STATE_OPEN:
@@ -131,7 +131,7 @@ int connection_or_finished_flushing(connection_t *conn) {
 
   assert_connection_ok(conn,0);
 
-  switch(conn->state) {
+  switch (conn->state) {
     case OR_CONN_STATE_PROXY_FLUSHING:
       log_fn(LOG_DEBUG,"finished sending CONNECT to proxy.");
       conn->state = OR_CONN_STATE_PROXY_READING;

diff --git a/src/or/control.c b/src/or/control.c
index 79385844706c903949ac0f1f5c9b32d1f14da413..b1f9d608e073f3754e133aa072a9d2db5148b844 100644 (file)
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -669,7 +669,6 @@ static int handle_control_attachstream(connection_t *conn, uint32_t len,
     return 0;
   }
 
-
   if (!(circ = circuit_get_by_global_id(circ_id))) {
     send_control_error(conn, ERR_NO_CIRC, "No circuit found with given ID");
     return 0;

diff --git a/src/or/dns.c b/src/or/dns.c
index 1c0310ef656a25f288d2479b126a1a965769c239..d5aeb8208a31cac802bac6489c476f1a4a90d5ab 100644 (file)
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -101,7 +101,7 @@ void dns_init(void) {
 
 static void
 _free_cached_resolve(struct cached_resolve *r) {
-  while(r->pending_connections) {
+  while (r->pending_connections) {
     struct pending_connection_t *victim = r->pending_connections;
     r->pending_connections = victim->next;
     tor_free(victim);

diff --git a/src/or/main.c b/src/or/main.c
index 0c9eacf8c422c54f5c394e887a27f5928cd76472..226a5aa76f53b14fdb5e0ec46cf2cef89c848c79 100644 (file)
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1074,7 +1074,7 @@ static void signal_callback(int fd, short events, void *arg)
 
 /** Write all statistics to the log, with log level 'severity'.  Called
  * in response to a SIGUSR1. */
-static void 
+static void
 dumpstats(int severity) {
   int i;
   connection_t *conn;
@@ -1597,7 +1597,7 @@ int tor_main(int argc, char *argv[]) {
     return -1;
   switch (get_options()->command) {
   case CMD_RUN_TOR:
-#ifdef MS_WINDOWS_SERVICE 
+#ifdef MS_WINDOWS_SERVICE
     service_status.dwCurrentState = SERVICE_RUNNING;
 #endif
     do_main_loop();