aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-11-30 12:09:53 -0500
committerNick Mathewson <nickm@torproject.org>2011-11-30 12:09:53 -0500
commitc5e2bfa98341b6e91ee7543232ece9a86c77d2c0 (patch)
tree9bfb540ddbe5e025a72e04b3d13e5e4400035a33 /src
parent8cc8b016c87eea632c46e20d8a2dd053b606655f (diff)
downloadtor-c5e2bfa98341b6e91ee7543232ece9a86c77d2c0.tar
tor-c5e2bfa98341b6e91ee7543232ece9a86c77d2c0.tar.gz
appease "make check-spaces"
Diffstat (limited to 'src')
-rw-r--r--src/or/config.c3
-rw-r--r--src/or/or.h3
-rw-r--r--src/or/rendservice.c3
3 files changed, 6 insertions, 3 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 40b61872f..fb5b49a53 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -4464,7 +4464,8 @@ options_init_from_torrc(int argc, char **argv)
goto err;
}
- retval = options_init_from_string(cf_defaults, cf, command, command_arg, &errmsg);
+ retval = options_init_from_string(cf_defaults, cf, command, command_arg,
+ &errmsg);
tor_free(cf);
tor_free(cf_defaults);
if (retval < 0)
diff --git a/src/or/or.h b/src/or/or.h
index c342880fb..46fead405 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2970,7 +2970,8 @@ typedef struct {
config_line_t *TransPort;
config_line_t *NATDPort; /**< Ports to listen on for transparent natd
* connections. */
- config_line_t *ControlPort; /**< Port to listen on for control connections. */
+ config_line_t *ControlPort; /**< Port to listen on for control
+ * connections. */
config_line_t *ControlSocket; /**< List of Unix Domain Sockets to listen on
* for control connections. */
int ControlSocketsGroupWritable; /**< Boolean: Are control sockets g+rw? */
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index b4ef8b470..1d0773e1c 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -2026,7 +2026,8 @@ rend_services_introduce(void)
/* Find out which introduction points we have in progress for this
service. */
- SMARTLIST_FOREACH_BEGIN(service->intro_nodes, rend_intro_point_t *, intro){
+ SMARTLIST_FOREACH_BEGIN(service->intro_nodes, rend_intro_point_t *,
+ intro) {
origin_circuit_t *intro_circ =
find_intro_circuit(intro, service->pk_digest);