Appease make check-spaces

10 files changed, 22 insertions, 12 deletions

diff --git a/src/or/channeltls.c b/src/or/channeltls.c
index ecf02182fc..c90f569233 100644
--- a/src/or/channeltls.c
+++ b/src/or/channeltls.c
@@ -2004,7 +2004,7 @@ channel_tls_process_auth_challenge_cell(var_cell_t *cell, channel_tls_t *chan)
     goto done;
   }
 
-done:
+ done:
   auth_challenge_cell_free(ac);
 
 #undef ERR
diff --git a/src/or/control.c b/src/or/control.c
index 746dfff921..2eaad4e373 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -6029,7 +6029,7 @@ get_desc_id_from_query(const rend_data_t *rend_data, const char *hsdir_fp)
     } SMARTLIST_FOREACH_END(fingerprint);
   }
 
-end:
+ end:
   return desc_id;
 }
 
diff --git a/src/or/dircollate.c b/src/or/dircollate.c
index 20dfb357a8..34259ecf97 100644
--- a/src/or/dircollate.c
+++ b/src/or/dircollate.c
@@ -59,8 +59,10 @@ ddmap_entry_set_digests(ddmap_entry_t *ent,
   memcpy(ent->d + DIGEST_LEN, ed25519, DIGEST256_LEN);
 }
 
-HT_PROTOTYPE(double_digest_map, ddmap_entry_s, node, ddmap_entry_hash, ddmap_entry_eq);
-HT_GENERATE2(double_digest_map, ddmap_entry_s, node, ddmap_entry_hash, ddmap_entry_eq, 0.6, tor_reallocarray, tor_free_);
+HT_PROTOTYPE(double_digest_map, ddmap_entry_s, node, ddmap_entry_hash,
+             ddmap_entry_eq);
+HT_GENERATE2(double_digest_map, ddmap_entry_s, node, ddmap_entry_hash,
+             ddmap_entry_eq, 0.6, tor_reallocarray, tor_free_);
 static void
 dircollator_add_routerstatus(dircollator_t *dc,
                              int vote_num,
diff --git a/src/or/dircollate.h b/src/or/dircollate.h
index 9eba37a010..cd1e8ac96d 100644
--- a/src/or/dircollate.h
+++ b/src/or/dircollate.h
@@ -47,3 +47,4 @@ struct dircollator_s {
 #endif
 
 #endif
+
diff --git a/src/or/or.h b/src/or/or.h
index 81e1c1c1db..ec5f2774ba 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -4281,7 +4281,6 @@ typedef struct {
    * XXXX Eventually, the default will be 0. */
   int ExitRelay;
 
-
   /** For how long (seconds) do we declare our singning keys to be valid? */
   int SigningKeyLifetime;
   /** For how long (seconds) do we declare our link keys to be valid? */
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index d27b06d5df..c857d4cc87 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -581,7 +581,8 @@ rend_config_services(const or_options_t *options, int validate_only)
                                                         10, 0, 1, &ok, NULL);
       if (!ok) {
         log_warn(LD_CONFIG,
-                 "HiddenServiceMaxStreamsCloseCircuit should be 0 or 1, not %s",
+                 "HiddenServiceMaxStreamsCloseCircuit should be 0 or 1, "
+                 "not %s",
                  line->value);
         rend_service_free(service);
         return -1;
diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c
index a76bf99b3a..8b1ade599c 100644
--- a/src/or/routerkeys.c
+++ b/src/or/routerkeys.c
@@ -312,7 +312,8 @@ load_ed_keys(const or_options_t *options, time_t now)
     check_signing_cert = signing_key_cert;
     use_signing = master_signing_key;
   } else {
-    char *fname = options_get_datadir_fname2(options, "keys", "ed25519_signing");
+    char *fname =
+      options_get_datadir_fname2(options, "keys", "ed25519_signing");
     sign = ed_key_init_from_file(
                fname,
                INIT_ED_KEY_NEEDCERT|
@@ -340,7 +341,8 @@ load_ed_keys(const or_options_t *options, time_t now)
     if (! want_new_signing_key)
       flags |= INIT_ED_KEY_OMIT_SECRET;
 
-    char *fname = options_get_datadir_fname2(options, "keys", "ed25519_master_id");
+    char *fname =
+      options_get_datadir_fname2(options, "keys", "ed25519_master_id");
     id = ed_key_init_from_file(
              fname,
              flags,
@@ -363,7 +365,8 @@ load_ed_keys(const or_options_t *options, time_t now)
                       INIT_ED_KEY_EXTRA_STRONG|
                       INIT_ED_KEY_NEEDCERT|
                       INIT_ED_KEY_INCLUDE_SIGNING_KEY_IN_CERT);
-    char *fname = options_get_datadir_fname2(options, "keys", "ed25519_signing");
+    char *fname =
+      options_get_datadir_fname2(options, "keys", "ed25519_signing");
     sign = ed_key_init_from_file(fname,
                                  flags, LOG_WARN,
                                  sign_signing_key_with_id, now,
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 7eba13a544..35021964a2 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -4921,7 +4921,8 @@ routerinfo_incompatible_with_extrainfo(const routerinfo_t *ri,
    * digest256 was in the ri. */
   digest256_matches = tor_memeq(ei->digest256,
                                 ri->extra_info_digest256, DIGEST256_LEN);
-  digest256_matches |= tor_mem_is_zero(ri->extra_info_digest256, DIGEST256_LEN);
+  digest256_matches |=
+    tor_mem_is_zero(ri->extra_info_digest256, DIGEST256_LEN);
 
   /* The identity must match exactly to have been generated at the same time
    * by the same router. */
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 1835bf8194..1413d40703 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -2352,7 +2352,8 @@ routerstatus_parse_entry_from_string(memarea_t *area,
         if (!strcmp(t->args[0], "ed25519")) {
           vote_rs->has_ed25519_listing = 1;
           if (strcmp(t->args[1], "none") &&
-              digest256_from_base64((char*)vote_rs->ed25519_id, t->args[1])<0) {
+              digest256_from_base64((char*)vote_rs->ed25519_id,
+                                    t->args[1])<0) {
             log_warn(LD_DIR, "Bogus ed25519 key in networkstatus vote");
             goto err;
           }
@@ -3184,7 +3185,8 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out,
   }
   if (ns_type != NS_TYPE_CONSENSUS) {
     digest256map_t *ed_id_map = digest256map_new();
-    SMARTLIST_FOREACH_BEGIN(ns->routerstatus_list, vote_routerstatus_t *, vrs) {
+    SMARTLIST_FOREACH_BEGIN(ns->routerstatus_list, vote_routerstatus_t *,
+                            vrs) {
       if (! vrs->has_ed25519_listing ||
           tor_mem_is_zero((const char *)vrs->ed25519_id, DIGEST256_LEN))
         continue;
diff --git a/src/or/torcert.c b/src/or/torcert.c
index 838501ea49..f028910a70 100644
--- a/src/or/torcert.c
+++ b/src/or/torcert.c
@@ -282,3 +282,4 @@ tor_make_rsa_ed25519_crosscert(const ed25519_public_key_t *ed_key,
   *cert = res;
   return sz;
 }
+