summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Shepard <andrea@torproject.org>2016-07-29 05:05:12 +0000
committerAndrea Shepard <andrea@torproject.org>2016-07-29 05:05:12 +0000
commit1995328a3d0c98f5a8856f532b20099970afecc2 (patch)
tree9def2da5c649fca44a5339fa524c56686af26b77
parentdffc6910b11d88544a93c3e3e80c1155f998f561 (diff)
downloadtor-1995328a3d0c98f5a8856f532b20099970afecc2.tar.gz
tor-1995328a3d0c98f5a8856f532b20099970afecc2.zip
Keep make check-spaces happy
-rw-r--r--src/common/compat.c1
-rw-r--r--src/common/compat_time.c1
-rw-r--r--src/common/timers.h3
-rw-r--r--src/common/util.h1
-rw-r--r--src/or/control.c3
5 files changed, 5 insertions, 4 deletions
diff --git a/src/common/compat.c b/src/common/compat.c
index e0807e4c87..b2ed119358 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -2824,7 +2824,6 @@ compute_num_cpus(void)
return num_cpus;
}
-
#if !defined(_WIN32)
/** Defined iff we need to add locks when defining fake versions of reentrant
* versions of time-related functions. */
diff --git a/src/common/compat_time.c b/src/common/compat_time.c
index 7676e3a0e5..3493ea0c22 100644
--- a/src/common/compat_time.c
+++ b/src/common/compat_time.c
@@ -626,3 +626,4 @@ monotime_coarse_absolute_msec(void)
return monotime_coarse_absolute_nsec() / ONE_MILLION;
}
#endif
+
diff --git a/src/common/timers.h b/src/common/timers.h
index 2c36af172d..5f918f8e15 100644
--- a/src/common/timers.h
+++ b/src/common/timers.h
@@ -9,7 +9,8 @@
struct monotime_t;
typedef struct timeout tor_timer_t;
-typedef void (*timer_cb_fn_t)(tor_timer_t *, void *, const struct monotime_t *);
+typedef void (*timer_cb_fn_t)(tor_timer_t *, void *,
+ const struct monotime_t *);
tor_timer_t *timer_new(timer_cb_fn_t cb, void *arg);
void timer_set_cb(tor_timer_t *t, timer_cb_fn_t cb, void *arg);
void timer_schedule(tor_timer_t *t, const struct timeval *delay);
diff --git a/src/common/util.h b/src/common/util.h
index 9face0c322..7a6203aeea 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -154,7 +154,6 @@ int n_bits_set_u8(uint8_t v);
int64_t clamp_double_to_int64(double number);
void simplify_fraction64(uint64_t *numer, uint64_t *denom);
-
/* Compute the CEIL of <b>a</b> divided by <b>b</b>, for nonnegative <b>a</b>
* and positive <b>b</b>. Works on integer types only. Not defined if a+b can
* overflow. */
diff --git a/src/or/control.c b/src/or/control.c
index ec76ecfca9..64a980de6c 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -1865,7 +1865,8 @@ getinfo_helper_dir(control_connection_t *control_conn,
const routerinfo_t *ri = NULL;
/* XXX Setting 'warn_if_unnamed' here is a bit silly -- the
* warning goes to the user, not to the controller. */
- const node_t *node = node_get_by_nickname(question+strlen("desc/name/"), 1);
+ const node_t *node =
+ node_get_by_nickname(question+strlen("desc/name/"), 1);
if (node)
ri = node->ri;
if (ri) {