[tor-commits] [tor/master] Appease make check-spaces

andrea at torproject.org andrea at torproject.org
Tue Feb 23 05:11:20 UTC 2016


commit cda238178986e79ff8f783469682f33fa7230a26
Author: Andrea Shepard <andrea at torproject.org>
Date:   Tue Feb 23 05:07:29 2016 +0000

    Appease make check-spaces
---
 src/common/util.c          | 4 ++--
 src/or/directory.c         | 7 ++++---
 src/test/test_routerlist.c | 1 -
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/common/util.c b/src/common/util.c
index fda5993..488f1b6 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -2080,7 +2080,7 @@ check_private_dir(const char *dirname, cpd_check_t check,
    */
   tor_assert(dirname);
 
-  /* Open directory. 
+  /* Open directory.
    * O_NOFOLLOW to ensure that it does not follow symbolic links */
   fd = open(sandbox_intern_string(dirname), O_NOFOLLOW);
 
@@ -2122,7 +2122,7 @@ check_private_dir(const char *dirname, cpd_check_t check,
 
       if ( fd == -1 ) return -1;
 
-    } else if (!(check & CPD_CHECK)) { 
+    } else if (!(check & CPD_CHECK)) {
       log_warn(LD_FS, "Directory %s does not exist.", dirname);
       return -1;
     }
diff --git a/src/or/directory.c b/src/or/directory.c
index 6c8b6a2..399752a 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -2363,9 +2363,10 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
 
   if (conn->base_.purpose == DIR_PURPOSE_UPLOAD_RENDDESC_V2) {
     #define SEND_HS_DESC_UPLOAD_FAILED_EVENT(reason) ( \
-      control_event_hs_descriptor_upload_failed(conn->identity_digest, \
-                                                conn->rend_data->onion_address, \
-                                                reason) )
+      control_event_hs_descriptor_upload_failed( \
+        conn->identity_digest, \
+        conn->rend_data->onion_address, \
+        reason) )
     log_info(LD_REND,"Uploaded rendezvous descriptor (status %d "
              "(%s))",
              status_code, escaped(reason));
diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c
index 010dfd6..31533d0 100644
--- a/src/test/test_routerlist.c
+++ b/src/test/test_routerlist.c
@@ -145,7 +145,6 @@ construct_consensus(const char **consensus_text_md)
   tt_int_op(n_vrs, ==, 4);
   tt_int_op(smartlist_len(v1->routerstatus_list), ==, 4);
 
-
   dir_common_construct_vote_2(&vote, cert2, sign_skey_2,
                               &dir_common_gen_routerstatus_for_v3ns,
                               &v2, &n_vrs, now, 1);



More information about the tor-commits mailing list