[tor-commits] [tor/master] whitespace fixes

[nickm at torproject.org]

commit 034e2788f812852ed530b42291b3e07c7dc85d84
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 23 11:18:28 2015 -0500

    whitespace fixes
---
 src/or/circuitbuild.h       |    3 ++-
 src/or/config.c             |    1 -
 src/or/cpuworker.c          |    1 -
 src/or/directory.c          |    1 -
 src/or/directory.h          |    3 ++-
 src/or/routerlist.c         |    6 +++---
 src/test/test_crypto_slow.c |    1 -
 src/test/test_routerlist.c  |    2 +-
 src/test/test_util_slow.c   |    1 +
 9 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/or/circuitbuild.h b/src/or/circuitbuild.h
index 7d49530..c72016d 100644
--- a/src/or/circuitbuild.h
+++ b/src/or/circuitbuild.h
@@ -22,7 +22,8 @@ origin_circuit_t *circuit_establish_circuit(uint8_t purpose,
                                             extend_info_t *exit,
                                             int flags);
 int circuit_handle_first_hop(origin_circuit_t *circ);
-void circuit_n_chan_done(channel_t *chan, int status, int close_origin_circuits);
+void circuit_n_chan_done(channel_t *chan, int status,
+                         int close_origin_circuits);
 int inform_testing_reachability(void);
 int circuit_timeout_want_to_count_circ(origin_circuit_t *circ);
 int circuit_send_next_onion_skin(origin_circuit_t *circ);
diff --git a/src/or/config.c b/src/or/config.c
index 91fbe97..568baec 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -5758,7 +5758,6 @@ parse_port_config(smartlist_t *out,
     return 0;
   } /* end if (listenaddrs) */
 
-
   /* No ListenAddress lines. If there's no FooPort, then maybe make a default
    * one. */
   if (! ports) {
diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c
index 39d2079..0785c67 100644
--- a/src/or/cpuworker.c
+++ b/src/or/cpuworker.c
@@ -366,7 +366,6 @@ cpuworker_onion_handshake_replyfn(void *work_)
   }
   log_debug(LD_OR,"onionskin_answer succeeded. Yay.");
 
-
  done_processing:
   memwipe(&rpl, 0, sizeof(rpl));
   memwipe(job, 0, sizeof(*job));
diff --git a/src/or/directory.c b/src/or/directory.c
index 348d971..d2b6b86 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -236,7 +236,6 @@ dir_fetch_type(int dir_purpose, int router_purpose, const char *resource)
   return type;
 }
 
-
 /** Return true iff <b>identity_digest</b> is the digest of a router which
  * says that it caches extrainfos.  (If <b>is_authority</b> we always
  * believe that to be true.) */
diff --git a/src/or/directory.h b/src/or/directory.h
index 51e6ed3..4899eb5 100644
--- a/src/or/directory.h
+++ b/src/or/directory.h
@@ -123,7 +123,8 @@ int download_status_get_n_failures(const download_status_t *dls);
 /* Used only by directory.c and test_dir.c */
 
 STATIC int parse_http_url(const char *headers, char **url);
-STATIC int purpose_needs_anonymity(uint8_t dir_purpose, uint8_t router_purpose);
+STATIC int purpose_needs_anonymity(uint8_t dir_purpose,
+                                   uint8_t router_purpose);
 STATIC dirinfo_type_t dir_fetch_type(int dir_purpose, int router_purpose,
                                      const char *resource);
 #endif
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index dacf980..fe92ac0 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -1442,7 +1442,7 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags,
   const networkstatus_t *consensus = networkstatus_get_latest_consensus();
   const int requireother = ! (flags & PDS_ALLOW_SELF);
   const int fascistfirewall = ! (flags & PDS_IGNORE_FASCISTFIREWALL);
-  const int no_serverdesc_fetching = (flags & PDS_NO_EXISTING_SERVERDESC_FETCH);
+  const int no_serverdesc_fetching =(flags & PDS_NO_EXISTING_SERVERDESC_FETCH);
   const int no_microdesc_fetching = (flags & PDS_NO_EXISTING_MICRODESC_FETCH);
   const int for_guard = (flags & PDS_FOR_GUARD);
   int try_excluding = 1, n_excluded = 0, n_busy = 0;
@@ -4265,7 +4265,8 @@ MOCK_IMPL(STATIC void, initiate_descriptor_downloads,
     if (b64_256) {
       digest256_to_base64(cp, smartlist_get(digests, lo));
     } else {
-      base16_encode(cp, enc_digest_len, smartlist_get(digests, lo), digest_len);
+      base16_encode(cp, enc_digest_len, smartlist_get(digests, lo),
+                    digest_len);
     }
     smartlist_add(tmp, cp);
   }
@@ -4372,7 +4373,6 @@ launch_descriptor_downloads(int purpose,
                  "tried downloading descriptors recently. Downloading.",
                  descname);
       }
-
     }
   }
 
diff --git a/src/test/test_crypto_slow.c b/src/test/test_crypto_slow.c
index 94fd69d..a0f6cdc 100644
--- a/src/test/test_crypto_slow.c
+++ b/src/test/test_crypto_slow.c
@@ -10,7 +10,6 @@
 #include "crypto_s2k.h"
 #include "crypto_pwbox.h"
 
-
 /** Run unit tests for our secret-to-key passphrase hashing functionality. */
 static void
 test_crypto_s2k_rfc2440(void *arg)
diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c
index 390b691..381a592 100644
--- a/src/test/test_routerlist.c
+++ b/src/test/test_routerlist.c
@@ -7,7 +7,6 @@
 #include "directory.h"
 #include "test.h"
 
-
 /* 4 digests + 3 sep + pre + post + NULL */
 static char output[4*BASE64_DIGEST256_LEN+3+2+2+1];
 
@@ -101,3 +100,4 @@ struct testcase_t routerlist_tests[] = {
   NODE(launch_descriptor_downloads, 0),
   END_OF_TESTCASES
 };
+
diff --git a/src/test/test_util_slow.c b/src/test/test_util_slow.c
index 4adcbe1..a597ef3 100644
--- a/src/test/test_util_slow.c
+++ b/src/test/test_util_slow.c
@@ -386,3 +386,4 @@ struct testcase_t slow_util_tests[] = {
   UTIL_TEST(spawn_background_waitpid_notify, 0),
   END_OF_TESTCASES
 };
+