[tor-commits] [tor/master] Whitespace cleaning

nickm at torproject.org nickm at torproject.org
Fri Oct 14 14:40:43 UTC 2016


commit 55c468c5211d5b74acb677767f14d91cd0304771
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Oct 14 10:40:31 2016 -0400

    Whitespace cleaning
---
 src/or/rendservice.c       | 4 ++--
 src/or/routerparse.c       | 1 -
 src/test/test_config.c     | 1 -
 src/test/test_controller.c | 1 -
 src/test/test_util.c       | 1 -
 5 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index a2d7a37..3afe880 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -382,8 +382,8 @@ rend_service_parse_port_config(const char *string, const char *sep,
     ret = port_cfg_line_extract_addrport(addrport_element, &addrport,
                                          &is_unix, &rest);
     if (ret < 0) {
-      tor_asprintf(&err_msg, "Couldn't process address <%s> from hidden service "
-                   "configuration", addrport_element);
+      tor_asprintf(&err_msg, "Couldn't process address <%s> from hidden "
+                   "service configuration", addrport_element);
       goto err;
     }
     if (is_unix) {
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index db3d004..df9b768 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -2910,7 +2910,6 @@ routerstatus_parse_entry_from_string(memarea_t *area,
     rs->is_flagged_running = 1; /* Starting with consensus method 4. */
     if (consensus_method >= MIN_METHOD_FOR_EXCLUDING_INVALID_NODES)
       rs->is_valid = 1;
-
   }
   int found_protocol_list = 0;
   if ((tok = find_opt_by_keyword(tokens, K_PROTO))) {
diff --git a/src/test/test_config.c b/src/test/test_config.c
index 4efefa8..384bff4 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -3848,7 +3848,6 @@ test_config_port_cfg_line_extract_addrport(void *arg)
   tor_free(a);
 }
 
-
 static config_line_t *
 mock_config_line(const char *key, const char *val)
 {
diff --git a/src/test/test_controller.c b/src/test/test_controller.c
index 4ae35c8..f19c846 100644
--- a/src/test/test_controller.c
+++ b/src/test/test_controller.c
@@ -200,7 +200,6 @@ test_rend_service_parse_port_config(void *arg)
             "in hidden service port configuration.");
   tor_free(err_msg);
 
-
  done:
   rend_service_port_config_free(cfg);
   tor_free(err_msg);
diff --git a/src/test/test_util.c b/src/test/test_util.c
index a548b2a..7276c0c 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -1671,7 +1671,6 @@ test_util_config_line_crlf(void *arg)
   tor_free(k); tor_free(v);
 }
 
-
 #ifndef _WIN32
 static void
 test_util_expand_filename(void *arg)



More information about the tor-commits mailing list