commit 7a940fac1c7f0ff81f58ed26350fed57e26b2642 Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 13 13:46:47 2015 -0500
appease check-spaces --- src/common/util.c | 4 +++- src/or/circuitlist.c | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/common/util.c b/src/common/util.c index 6a5b13e..ce3646c 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -5415,7 +5415,8 @@ tor_weak_random_range(tor_weak_rng_t *rng, int32_t top) /** Cast a given double value to a int64_t. Return 0 if number is NaN. * Returns either INT64_MIN or INT64_MAX if number is outside of the int64_t * range. */ -int64_t clamp_double_to_int64(double number) +int64_t +clamp_double_to_int64(double number) { int exp;
@@ -5445,3 +5446,4 @@ int64_t clamp_double_to_int64(double number) /* Handle infinities and finite numbers with magnitude >= 2^63. */ return signbit(number) ? INT64_MIN : INT64_MAX; } + diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 324f9f3..c4992d4 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -44,8 +44,8 @@ static smartlist_t *global_circuitlist = NULL; /** A list of all the circuits in CIRCUIT_STATE_CHAN_WAIT. */ static smartlist_t *circuits_pending_chans = NULL;
-/** A list of all the circuits that have been marked with circuit_mark_for_close - * and which are waiting for circuit_about_to_free(). */ +/** A list of all the circuits that have been marked with + * circuit_mark_for_close and which are waiting for circuit_about_to_free. */ static smartlist_t *circuits_pending_close = NULL;
static void circuit_free_cpath_node(crypt_path_t *victim); @@ -1860,7 +1860,6 @@ circuit_about_to_free(circuit_t *circ) connection_edge_destroy(circ->n_circ_id, conn); ocirc->p_streams = NULL; } - }
/** Given a marked circuit <b>circ</b>, aggressively free its cell queues to