[or-cvs] [tor/release-0.2.2] fix whitespace issues

[arma at torproject.org]

commit 989db9aed19f0ca3c93a1638bab4a2b473a94aa9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 3 11:57:42 2011 -0500

    fix whitespace issues
---
 src/or/circuitbuild.c |    5 +++--
 src/or/command.c      |    3 ++-
 src/or/onion.c        |    4 ++--
 src/or/rendmid.c      |    6 ++++--
 src/or/routerparse.c  |    1 -
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index e86d3d4..065eb05 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -768,7 +768,8 @@ circuit_extend(cell_t *cell, circuit_t *circ)
   n_addr32 = ntohl(get_uint32(cell->payload+RELAY_HEADER_SIZE));
   n_port = ntohs(get_uint16(cell->payload+RELAY_HEADER_SIZE+4));
   onionskin = (char*) cell->payload+RELAY_HEADER_SIZE+4+2;
-  id_digest = (char*) cell->payload+RELAY_HEADER_SIZE+4+2+ONIONSKIN_CHALLENGE_LEN;
+  id_digest = (char*) cell->payload+RELAY_HEADER_SIZE+4+2+
+    ONIONSKIN_CHALLENGE_LEN;
   tor_addr_from_ipv4h(&n_addr, n_addr32);
 
   if (!n_port || !n_addr32) {
@@ -923,7 +924,7 @@ circuit_finish_handshake(origin_circuit_t *circ, uint8_t reply_type,
   tor_assert(hop->state == CPATH_STATE_AWAITING_KEYS);
 
   if (reply_type == CELL_CREATED && hop->dh_handshake_state) {
-    if (onion_skin_client_handshake(hop->dh_handshake_state, (char*)reply, keys,
+    if (onion_skin_client_handshake(hop->dh_handshake_state, (char*)reply,keys,
                                     DIGEST_LEN*2+CIPHER_KEY_LEN*2) < 0) {
       log_warn(LD_CIRC,"onion_skin_client_handshake failed.");
       return -END_CIRC_REASON_TORPROTOCOL;
diff --git a/src/or/command.c b/src/or/command.c
index 69205c4..9269456 100644
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -576,7 +576,8 @@ command_process_netinfo_cell(cell_t *cell, or_connection_t *conn)
     /* Consider all the other addresses; if any matches, this connection is
      * "canonical." */
     tor_addr_t addr;
-    const uint8_t *next = decode_address_from_payload(&addr, cp, (int)(end-cp));
+    const uint8_t *next =
+      decode_address_from_payload(&addr, cp, (int)(end-cp));
     if (next == NULL) {
       log_fn(LOG_PROTOCOL_WARN,  LD_OR,
              "Bad address in netinfo cell; closing connection.");
diff --git a/src/or/onion.c b/src/or/onion.c
index 9c826a5..45c75b0 100644
--- a/src/or/onion.c
+++ b/src/or/onion.c
@@ -379,8 +379,8 @@ fast_server_handshake(const uint8_t *key_in, /* DIGEST_LEN bytes */
  * and protected by TLS).
  */
 int
-fast_client_handshake(const uint8_t *handshake_state, /* DIGEST_LEN bytes */
-                      const uint8_t *handshake_reply_out, /* DIGEST_LEN*2 bytes */
+fast_client_handshake(const uint8_t *handshake_state,/*DIGEST_LEN bytes*/
+                      const uint8_t *handshake_reply_out,/*DIGEST_LEN*2 bytes*/
                       uint8_t *key_out,
                       size_t key_out_len)
 {
diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index 84b1214..064f1be 100644
--- a/src/or/rendmid.c
+++ b/src/or/rendmid.c
@@ -64,7 +64,8 @@ rend_mid_establish_intro(or_circuit_t *circ, const uint8_t *request,
   }
   /* Rest of body: signature of previous data */
   note_crypto_pk_op(REND_MID);
-  if (crypto_pk_public_checksig_digest(pk, (char*)request, 2+asn1len+DIGEST_LEN,
+  if (crypto_pk_public_checksig_digest(pk,
+                                       (char*)request, 2+asn1len+DIGEST_LEN,
                                        (char*)(request+2+DIGEST_LEN+asn1len),
                                        request_len-(2+DIGEST_LEN+asn1len))<0) {
     log_warn(LD_PROTOCOL,
@@ -125,7 +126,8 @@ rend_mid_establish_intro(or_circuit_t *circ, const uint8_t *request,
  * INTRODUCE2 cell.
  */
 int
-rend_mid_introduce(or_circuit_t *circ, const uint8_t *request, size_t request_len)
+rend_mid_introduce(or_circuit_t *circ, const uint8_t *request,
+                   size_t request_len)
 {
   or_circuit_t *intro_circ;
   char serviceid[REND_SERVICE_ID_LEN_BASE32+1];
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index e580df2..fc30c62 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -2170,7 +2170,6 @@ networkstatus_v2_parse_from_string(const char *s)
   return ns;
 }
 
-
 /** Parse a v3 networkstatus vote, opinion, or consensus (depending on
  * ns_type), from <b>s</b>, and return the result.  Return NULL on failure. */
 networkstatus_t *