[tor-commits] [tor/master] Fix formatting in various places after 6465/6816 work

[andrea@xxxxxxxxxxxxxx]

commit 5543c5b202b045bc5b7d8d4f127c54decd17e943
Author: Andrea Shepard <andrea@xxxxxxxxxxxxxx>
Date:   Wed Oct 10 00:48:36 2012 -0700

    Fix formatting in various places after 6465/6816 work
---
 src/common/crypto.c      |    6 ++++--
 src/or/channel.c         |    5 +++--
 src/or/circuitmux.c      |    2 +-
 src/or/circuitmux_ewma.c |    6 +++---
 src/or/config.c          |    1 -
 src/or/networkstatus.c   |    1 -
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/common/crypto.c b/src/common/crypto.c
index 2de624c..87a86af 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -244,8 +244,10 @@ crypto_global_init(int useAccel, const char *accelName, const char *accelDir)
     }
 
     if (SSLeay() < OPENSSL_V_SERIES(1,0,0)) {
-      log_notice(LD_CRYPTO, "Your OpenSSL version seems to be %s. We "
-                 "recommend 1.0.0 or later.", crypto_openssl_get_version_str());
+      log_notice(LD_CRYPTO,
+                 "Your OpenSSL version seems to be %s. We recommend 1.0.0 "
+                 "or later.",
+                 crypto_openssl_get_version_str());
     }
 
     if (useAccel > 0) {
diff --git a/src/or/channel.c b/src/or/channel.c
index 1ca5e1a..570bb37 100644
--- a/src/or/channel.c
+++ b/src/or/channel.c
@@ -1518,7 +1518,7 @@ cell_queue_entry_dup(cell_queue_entry_t *q)
 
   rv = tor_malloc(sizeof(*rv));
   memcpy(rv, q, sizeof(*rv));
-  
+
   return rv;
 }
 
@@ -1529,7 +1529,8 @@ cell_queue_entry_dup(cell_queue_entry_t *q)
  */
 
 static void
-cell_queue_entry_free(cell_queue_entry_t *q, int handed_off) {
+cell_queue_entry_free(cell_queue_entry_t *q, int handed_off)
+{
   if (!q) return;
 
   if (!handed_off) {
diff --git a/src/or/circuitmux.c b/src/or/circuitmux.c
index 6a6fa6d..f3b6b7c 100644
--- a/src/or/circuitmux.c
+++ b/src/or/circuitmux.c
@@ -412,7 +412,7 @@ circuitmux_detach_all_circuits(circuitmux_t *cmux)
              * Update active_circuits et al.; this does policy notifies, so
              * comes before freeing policy data
              */
-            
+
             if (to_remove->muxinfo.cell_count > 0) {
               circuitmux_make_circuit_inactive(cmux, circ, CELL_DIRECTION_IN);
             }
diff --git a/src/or/circuitmux_ewma.c b/src/or/circuitmux_ewma.c
index 9c26e1b..82ad5c7 100644
--- a/src/or/circuitmux_ewma.c
+++ b/src/or/circuitmux_ewma.c
@@ -168,7 +168,7 @@ ewma_free_circ_data(circuitmux_t *cmux,
                     circuitmux_policy_data_t *pol_data,
                     circuit_t *circ,
                     circuitmux_policy_circ_data_t *pol_circ_data);
-static void 
+static void
 ewma_notify_circ_active(circuitmux_t *cmux,
                         circuitmux_policy_data_t *pol_data,
                         circuit_t *circ,
@@ -329,7 +329,7 @@ ewma_free_circ_data(circuitmux_t *cmux,
  * the active_circuits_pqueue.
  */
 
-static void 
+static void
 ewma_notify_circ_active(circuitmux_t *cmux,
                         circuitmux_policy_data_t *pol_data,
                         circuit_t *circ,
@@ -354,7 +354,7 @@ ewma_notify_circ_active(circuitmux_t *cmux,
  * the active_circuits_pqueue.
  */
 
-static void 
+static void
 ewma_notify_circ_inactive(circuitmux_t *cmux,
                           circuitmux_policy_data_t *pol_data,
                           circuit_t *circ,
diff --git a/src/or/config.c b/src/or/config.c
index 81528c8..3e92c43 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1389,7 +1389,6 @@ options_act(const or_options_t *old_options)
     channel_set_cmux_policy_everywhere(NULL);
   }
 
-
   /* Update the BridgePassword's hashed version as needed.  We store this as a
    * digest so that we can do side-channel-proof comparisons on it.
    */
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 0f6161e..91720b5 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -1844,7 +1844,6 @@ networkstatus_set_current_consensus(const char *consensus,
       channel_set_cmux_policy_everywhere(NULL);
     }
 
-
     /* XXXX024 this call might be unnecessary here: can changing the
      * current consensus really alter our view of any OR's rate limits? */
     connection_or_update_token_buckets(get_connection_array(), options);



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