Reduce make check-spaces noise

diff --git a/src/common/di_ops.c b/src/common/di_ops.c
index e671af6facb368113699a002b103cd34b17db4ea..4ed49e11649d4fef5dcf9073f2c4527f877f4f38 100644 (file)
--- a/src/common/di_ops.c
+++ b/src/common/di_ops.c
@@ -271,3 +271,4 @@ select_array_member_cumulative_timei(const uint64_t *entries, int n_entries,
 
   return i_chosen;
 }
+

diff --git a/src/common/di_ops.h b/src/common/di_ops.h
index f1050a00db80874510fc22b984a11a030161cd0d..0a154302bf667504b2e0d04fc6111d2e6a80a796 100644 (file)
--- a/src/common/di_ops.h
+++ b/src/common/di_ops.h
@@ -42,7 +42,8 @@ void dimap_add_entry(di_digest256_map_t **map,
                      const uint8_t *key, void *val);
 void *dimap_search(const di_digest256_map_t *map, const uint8_t *key,
                    void *dflt_val);
-int select_array_member_cumulative_timei(const uint64_t *entries, int n_entries,
+int select_array_member_cumulative_timei(const uint64_t *entries,
+                                         int n_entries,
                                          uint64_t total, uint64_t rand_val);
 
 #endif

diff --git a/src/common/pubsub.h b/src/common/pubsub.h
index 09e492ec4fd13741c3ac80fc9f6ee0946465d25e..bbb4f02a42f00793319b304af5a22b46f3e26317 100644 (file)
--- a/src/common/pubsub.h
+++ b/src/common/pubsub.h
@@ -21,7 +21,9 @@
  *                                       unsigned priority);
  *     int T_unsubscribe(const T_subscriber_t *)
  *
- * Elsewhere you can say DECLARE_NOTIFY_PUBSUB_TOPIC(static, T), which declares:
+ * Elsewhere you can say DECLARE_NOTIFY_PUBSUB_TOPIC(static, T), which
+ * declares:
+ *
  *    static int T_notify(T_event_data_t *, unsigned notify_flags);
  *    static void T_clear(void);
  *

diff --git a/src/common/util_bug.h b/src/common/util_bug.h
index 36056aa4bdf7b70dec8103b80f1a123df79d09f3..3f77e0a99efee11330994ea3f81990d5b7d7b60c 100644 (file)
--- a/src/common/util_bug.h
+++ b/src/common/util_bug.h
@@ -104,14 +104,14 @@
 
 #ifdef __GNUC__
 #define IF_BUG_ONCE__(cond,var)                                         \
-  if (({                                                                \
+  if (( {                                                                \
       static int var = 0;                                               \
       int bool_result = (cond);                                         \
       if (PREDICT_UNLIKELY(bool_result) && !var) {                      \
         var = 1;                                                        \
         tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, #cond, 1);  \
       }                                                                 \
-      PREDICT_UNLIKELY(bool_result); }))
+      PREDICT_UNLIKELY(bool_result); } ))
 #else
 #define IF_BUG_ONCE__(cond,var)                                         \
   static int var = 0;                                                   \

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index c9aced7eb3f46f36109ce05fe7ae23c7360548dc..799baa2accd31d571d4874fe7038385a364194c6 100644 (file)
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1703,7 +1703,8 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn,
     /* Fill in the rend_data field so we can start doing a connection to
      * a hidden service. */
     rend_data_t *rend_data = ENTRY_TO_EDGE_CONN(conn)->rend_data =
-      rend_data_client_create(socks->address, NULL, (char *) cookie, auth_type);
+      rend_data_client_create(socks->address, NULL, (char *) cookie,
+                              auth_type);
     if (rend_data == NULL) {
       return -1;
     }

diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index 56c49fee47d5f8d11298a0644a2da4ed5631017f..01b0766cf0a7a27409a30e34d3583428a100c643 100644 (file)
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@ -1067,4 +1067,3 @@ rend_auth_decode_cookie(const char *cookie_in, uint8_t *cookie_out,
   return res;
 }
 
-

diff --git a/src/or/routerlist.h b/src/or/routerlist.h
index d5a9b77a82b4faf60b1fcef069d7942cf5b8920e..be242d6e87e8dfb1365c487e6de6267f2ccc65cc 100644 (file)
--- a/src/or/routerlist.h
+++ b/src/or/routerlist.h
@@ -221,7 +221,8 @@ int hex_digest_nickname_matches(const char *hexdigest,
 STATIC int choose_array_element_by_weight(const uint64_t *entries,
                                           int n_entries);
 STATIC void scale_array_elements_to_u64(uint64_t *entries_out,
-                                        const double *entries_in, int n_entries,
+                                        const double *entries_in,
+                                        int n_entries,
                                         uint64_t *total_out);
 STATIC const routerstatus_t *router_pick_directory_server_impl(
                                            dirinfo_type_t auth, int flags,

diff --git a/src/test/test-timers.c b/src/test/test-timers.c
index 8f5ba7b78a98f8a6ea993ecd7ab299829d8656b8..0196ec1fef78e4e61546fbc891ea2d3c7da053a2 100644 (file)
--- a/src/test/test-timers.c
+++ b/src/test/test-timers.c
@@ -23,10 +23,10 @@
 #define MAX_DURATION 30
 #define N_DISABLE 5
 
-static struct timeval fire_at[N_TIMERS] = {{0,0}};
+static struct timeval fire_at[N_TIMERS] = { {0,0} };
 static int is_disabled[N_TIMERS] = {0};
 static int fired[N_TIMERS] = {0};
-static struct timeval difference[N_TIMERS] = {{0,0}};
+static struct timeval difference[N_TIMERS] = { {0,0} };
 static tor_timer_t *timers[N_TIMERS] = {NULL};
 
 static int n_active_timers = 0;
@@ -131,3 +131,4 @@ main(int argc, char **argv)
   timers_shutdown();
   return ret;
 }
+

diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c
index 0e82223786e60d875adfe2050bbeed7cb36430bf..616b313b166187a8b4ea2de325d846099605c3ba 100644 (file)
--- a/src/test/test_crypto.c
+++ b/src/test/test_crypto.c
@@ -542,7 +542,8 @@ test_crypto_aes_ctr_testvec(void *arg)
   char plaintext[16*4];
   base16_decode(key, sizeof(key), key16, strlen(key16));
   base16_decode(iv, sizeof(iv), ctr16, strlen(ctr16));
-  base16_decode(plaintext, sizeof(plaintext), plaintext16, strlen(plaintext16));
+  base16_decode(plaintext, sizeof(plaintext),
+                plaintext16, strlen(plaintext16));
 
   crypto_cipher_t *c = crypto_cipher_new_with_iv(key, iv);
   crypto_cipher_crypt_inplace(c, plaintext, sizeof(plaintext));
@@ -1396,9 +1397,11 @@ test_crypto_digest_names(void *arg)
   int i;
   for (i = 0; names[i].n; ++i) {
     tt_str_op(names[i].n, OP_EQ,crypto_digest_algorithm_get_name(names[i].a));
-    tt_int_op(names[i].a, OP_EQ,crypto_digest_algorithm_parse_name(names[i].n));
+    tt_int_op(names[i].a,
+              OP_EQ,crypto_digest_algorithm_parse_name(names[i].n));
   }
-  tt_int_op(-1, OP_EQ, crypto_digest_algorithm_parse_name("TimeCubeHash-4444"));
+  tt_int_op(-1, OP_EQ,
+            crypto_digest_algorithm_parse_name("TimeCubeHash-4444"));
  done:
   ;
 }
@@ -1887,7 +1890,6 @@ test_crypto_hkdf_sha256_testvecs(void *arg)
   tor_free(mem_op_hex_tmp);
 }
 
-
 static void
 test_crypto_curve25519_impl(void *arg)
 {