aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Shepard <andrea@torproject.org>2016-06-12 21:47:14 +0000
committerAndrea Shepard <andrea@torproject.org>2016-06-12 21:47:14 +0000
commit925f76b486444217035d1cc978cbdd398c17dfb1 (patch)
tree6c21190d1be0e10131149bfe99d18a7f6d4f4f80
parent0616fd6fb6db5385eac6b432892c90fbb38f8666 (diff)
downloadtor-925f76b486444217035d1cc978cbdd398c17dfb1.tar.gz
tor-925f76b486444217035d1cc978cbdd398c17dfb1.zip
Keep make check-spaces happy
-rw-r--r--src/common/address.h6
-rw-r--r--src/or/onion.c4
2 files changed, 6 insertions, 4 deletions
diff --git a/src/common/address.h b/src/common/address.h
index 3f0bb521cd..51db42c315 100644
--- a/src/common/address.h
+++ b/src/common/address.h
@@ -74,7 +74,8 @@ typedef struct tor_addr_port_t
#define TOR_ADDR_NULL {AF_UNSPEC, {0}}
static inline const struct in6_addr *tor_addr_to_in6(const tor_addr_t *a);
-static inline const struct in6_addr *tor_addr_to_in6_assert(const tor_addr_t *a);
+static inline const struct in6_addr *tor_addr_to_in6_assert(
+ const tor_addr_t *a);
static inline uint32_t tor_addr_to_ipv4n(const tor_addr_t *a);
static inline uint32_t tor_addr_to_ipv4h(const tor_addr_t *a);
static inline uint32_t tor_addr_to_mapped_ipv4h(const tor_addr_t *a);
@@ -98,7 +99,8 @@ tor_addr_to_in6(const tor_addr_t *a)
return a->family == AF_INET6 ? &a->addr.in6_addr : NULL;
}
-/** As tor_addr_to_in6, but assert that the address truly is an IPv6 address. */
+/** As tor_addr_to_in6, but assert that the address truly is an IPv6
+ * address. */
static inline const struct in6_addr *
tor_addr_to_in6_assert(const tor_addr_t *a)
{
diff --git a/src/or/onion.c b/src/or/onion.c
index 28b9787048..7c7f97fc42 100644
--- a/src/or/onion.c
+++ b/src/or/onion.c
@@ -39,8 +39,8 @@ typedef struct onion_queue_t {
/** Array of queues of circuits waiting for CPU workers. An element is NULL
* if that queue is empty.*/
static TOR_TAILQ_HEAD(onion_queue_head_t, onion_queue_t)
- ol_list[MAX_ONION_HANDSHAKE_TYPE+1] = {
- TOR_TAILQ_HEAD_INITIALIZER(ol_list[0]), /* tap */
+ ol_list[MAX_ONION_HANDSHAKE_TYPE+1] =
+{ TOR_TAILQ_HEAD_INITIALIZER(ol_list[0]), /* tap */
TOR_TAILQ_HEAD_INITIALIZER(ol_list[1]), /* fast */
TOR_TAILQ_HEAD_INITIALIZER(ol_list[2]), /* ntor */
};