summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-03-26 09:54:31 -0400
committerNick Mathewson <nickm@torproject.org>2016-03-26 09:54:31 -0400
commitc0568a89d93e05d98f4ef57d0b7bb659a357dbef (patch)
treeef06f4c9d2b157b7fcc3f4e417f43a7e6efd4f36
parentdd572dac34c0ba9e3c360d462d77a09e4f584511 (diff)
downloadtor-c0568a89d93e05d98f4ef57d0b7bb659a357dbef.tar.gz
tor-c0568a89d93e05d98f4ef57d0b7bb659a357dbef.zip
Whitespace fixes
-rw-r--r--src/common/sandbox.c1
-rw-r--r--src/or/dircollate.c3
-rw-r--r--src/or/entrynodes.c6
-rw-r--r--src/test/test_util.c1
4 files changed, 6 insertions, 5 deletions
diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index 7365d7ac4f..96429ce5aa 100644
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -1891,7 +1891,6 @@ sandbox_cfg_allow_chown_filename(sandbox_cfg_t **cfg, char *file)
return 0;
}
-
int
sandbox_cfg_allow_chmod_filename(sandbox_cfg_t **cfg, char *file)
{
diff --git a/src/or/dircollate.c b/src/or/dircollate.c
index ed52f0abb0..3f9d78f02d 100644
--- a/src/or/dircollate.c
+++ b/src/or/dircollate.c
@@ -34,7 +34,8 @@ ddmap_entry_free(ddmap_entry_t *e)
tor_free(e);
}
-/** Return a new empty ddmap_entry, with <b>n_votes</b> elements in vrs_list. */
+/** Return a new empty ddmap_entry, with <b>n_votes</b> elements in
+ * vrs_list. */
static ddmap_entry_t *
ddmap_entry_new(int n_votes)
{
diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index 8dbfeaecea..310a948b35 100644
--- a/src/or/entrynodes.c
+++ b/src/or/entrynodes.c
@@ -1822,7 +1822,8 @@ get_configured_bridge_by_addr_port_digest(const tor_addr_t *addr,
* bridge with no known digest whose address matches <b>addr</b>:<b>port</b>,
* return 1. Else return 0. If <b>digest</b> is NULL, check for
* address/port matches only. */
-int addr_is_a_configured_bridge(const tor_addr_t *addr,
+int
+addr_is_a_configured_bridge(const tor_addr_t *addr,
uint16_t port,
const char *digest)
{
@@ -1834,7 +1835,8 @@ int addr_is_a_configured_bridge(const tor_addr_t *addr,
* <b>ei->identity_digest</b>, or a bridge with no known digest whose address
* matches <b>ei->addr</b>:<b>ei->port</b>, return 1. Else return 0.
* If <b>ei->onion_key</b> is NULL, check for address/port matches only. */
-int extend_info_is_a_configured_bridge(const extend_info_t *ei)
+int
+extend_info_is_a_configured_bridge(const extend_info_t *ei)
{
const char *digest = ei->onion_key ? ei->identity_digest : NULL;
return addr_is_a_configured_bridge(&ei->addr, ei->port, digest);
diff --git a/src/test/test_util.c b/src/test/test_util.c
index 11eb18de74..8e5c9bf80a 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -821,7 +821,6 @@ test_util_parse_http_time(void *arg)
T("2038-02-17 06:13:20");
#endif
-
tt_int_op(-1,OP_EQ, parse_http_time("2004-08-zz 99-99x99 GMT", &a_time));
tt_int_op(-1,OP_EQ, parse_http_time("2011-03-32 00:00:00 GMT", &a_time));
tt_int_op(-1,OP_EQ, parse_http_time("2011-03-30 24:00:00 GMT", &a_time));