[tor-commits] [tor/master] Fix check-spaces complaints

nickm at torproject.org nickm at torproject.org
Fri Oct 2 11:22:05 UTC 2015


commit 0e03a0421ee83892b1612f74f95c01c15b4aef19
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Oct 2 13:22:00 2015 +0200

    Fix check-spaces complaints
---
 src/common/container.c  |    3 ++-
 src/common/log.c        |    3 ++-
 src/common/torlog.h     |    3 ++-
 src/test/test_address.c |    4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/common/container.c b/src/common/container.c
index df4952f..c6f0591 100644
--- a/src/common/container.c
+++ b/src/common/container.c
@@ -85,7 +85,8 @@ smartlist_ensure_capacity(smartlist_t *sl, int size)
     }
     sl->list = tor_reallocarray(sl->list, sizeof(void *),
                                 ((size_t)higher));
-    memset(sl->list + sl->capacity, 0, sizeof(void *) * (higher - sl->capacity));
+    memset(sl->list + sl->capacity, 0,
+           sizeof(void *) * (higher - sl->capacity));
     sl->capacity = higher;
   }
 #undef ASSERT_CAPACITY
diff --git a/src/common/log.c b/src/common/log.c
index 126fb2e..7ede610 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -1102,7 +1102,8 @@ add_file_log(const log_severity_list_t *severity, const char *filename,
  * Tor-<syslog_identity_tag> if that is not NULL.
  */
 int
-add_syslog_log(const log_severity_list_t *severity, const char* syslog_identity_tag)
+add_syslog_log(const log_severity_list_t *severity,
+               const char* syslog_identity_tag)
 {
   logfile_t *lf;
   if (syslog_count++ == 0) {
diff --git a/src/common/torlog.h b/src/common/torlog.h
index 57679b5..722d595 100644
--- a/src/common/torlog.h
+++ b/src/common/torlog.h
@@ -135,7 +135,8 @@ void add_stream_log(const log_severity_list_t *severity, const char *name,
 int add_file_log(const log_severity_list_t *severity, const char *filename,
                  const int truncate);
 #ifdef HAVE_SYSLOG_H
-int add_syslog_log(const log_severity_list_t *severity, const char* syslog_identity_tag);
+int add_syslog_log(const log_severity_list_t *severity,
+                   const char* syslog_identity_tag);
 #endif
 int add_callback_log(const log_severity_list_t *severity, log_callback cb);
 void logs_set_domain_logging(int enabled);
diff --git a/src/test/test_address.c b/src/test/test_address.c
index 938f776..e48c06a 100644
--- a/src/test/test_address.c
+++ b/src/test/test_address.c
@@ -836,7 +836,7 @@ test_address_get_if_addrs_internal_fail(void *arg)
   rv = get_interface_address(LOG_ERR, &ipv4h_addr);
   tt_assert(rv == -1);
 
-done:
+ done:
   UNMOCK(get_interface_addresses_raw);
   UNMOCK(get_interface_address6_via_udp_socket_hack);
   free_interface_address6_list(results1);
@@ -864,7 +864,7 @@ test_address_get_if_addrs_no_internal_fail(void *arg)
   tt_assert(results2 != NULL);
   tt_int_op(smartlist_len(results2),==,0);
 
-done:
+ done:
   UNMOCK(get_interface_addresses_raw);
   UNMOCK(get_interface_address6_via_udp_socket_hack);
   free_interface_address6_list(results1);



More information about the tor-commits mailing list