summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-03-15 09:21:29 -0400
committerNick Mathewson <nickm@torproject.org>2016-03-15 09:21:29 -0400
commitb48f8a8114575793046a8e9d3544d6b2d0a17f82 (patch)
tree406217796ac1f3ef57e50f3bebf2591a1da9b08a /src/or
parentc9899ee64008b63cb9867115ac684590dd50f902 (diff)
downloadtor-b48f8a8114575793046a8e9d3544d6b2d0a17f82.tar.gz
tor-b48f8a8114575793046a8e9d3544d6b2d0a17f82.zip
Fix whitespace.
Diffstat (limited to 'src/or')
-rw-r--r--src/or/circuitbuild.c4
-rw-r--r--src/or/config.c6
-rw-r--r--src/or/main.c3
-rw-r--r--src/or/rendcommon.c1
-rw-r--r--src/or/rendcommon.h2
-rw-r--r--src/or/routerlist.c1
6 files changed, 12 insertions, 5 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index a15f4c28b5..237b61ab18 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -2420,7 +2420,8 @@ build_state_get_exit_nickname(cpath_build_state_t *state)
}
/** Return true iff the given address can be used to extend to. */
-int extend_info_addr_is_allowed(const tor_addr_t *addr)
+int
+extend_info_addr_is_allowed(const tor_addr_t *addr)
{
tor_assert(addr);
@@ -2434,3 +2435,4 @@ int extend_info_addr_is_allowed(const tor_addr_t *addr)
disallow:
return 0;
}
+
diff --git a/src/or/config.c b/src/or/config.c
index 8f3c28c1c8..0e15f9bb07 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -6325,7 +6325,8 @@ parse_port_config(smartlist_t *out,
ipv4_traffic = 1, ipv6_traffic = 0, prefer_ipv6 = 0,
cache_ipv4 = 1, use_cached_ipv4 = 0,
cache_ipv6 = 0, use_cached_ipv6 = 0,
- prefer_ipv6_automap = 1, world_writable = 0, group_writable = 0, relax_dirmode_check = 0,
+ prefer_ipv6_automap = 1, world_writable = 0, group_writable = 0,
+ relax_dirmode_check = 0,
has_used_unix_socket_only_option = 0;
smartlist_split_string(elts, ports->value, NULL,
@@ -6577,7 +6578,8 @@ parse_port_config(smartlist_t *out,
if ( has_used_unix_socket_only_option && ! unix_socket_path) {
log_warn(LD_CONFIG, "You have a %sPort entry with GroupWritable, "
- "WorldWritable, or RelaxDirModeCheck, but it is not a unix socket.", portname);
+ "WorldWritable, or RelaxDirModeCheck, but it is not a "
+ "unix socket.", portname);
goto err;
}
diff --git a/src/or/main.c b/src/or/main.c
index cfd11696ec..713816d9b7 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -572,7 +572,8 @@ connection_check_event(connection_t *conn, struct event *ev)
conn_type_to_string(conn->type),
conn_state_to_string(conn->type, conn->state),
(int)conn->s, (int)conn->linked,
- (conn->type == CONN_TYPE_AP && TO_EDGE_CONN(conn)->is_dns_request),
+ (conn->type == CONN_TYPE_AP &&
+ TO_EDGE_CONN(conn)->is_dns_request),
conn->marked_for_close_file ? conn->marked_for_close_file : "-",
conn->marked_for_close
);
diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index 79509cbe2f..603e4f0dd9 100644
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@ -1009,3 +1009,4 @@ MOCK_IMPL(int, hid_serv_responsible_for_desc_id,
smartlist_free(responsible);
return result;
}
+
diff --git a/src/or/rendcommon.h b/src/or/rendcommon.h
index fe45299598..7d81976013 100644
--- a/src/or/rendcommon.h
+++ b/src/or/rendcommon.h
@@ -58,7 +58,7 @@ void rend_get_descriptor_id_bytes(char *descriptor_id_out,
const char *service_id,
const char *secret_id_part);
int hid_serv_get_responsible_directories(smartlist_t *responsible_dirs,
- const char *id);
+ const char *id);
int hid_serv_acting_as_directory(void);
MOCK_DECL(int, hid_serv_responsible_for_desc_id, (const char *id));
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 7f20aa9c3e..bc5e2e9133 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -5395,3 +5395,4 @@ refresh_all_country_info(void)
nodelist_refresh_countries();
}
+