diff options
| -rw-r--r-- | src/or/circuitlist.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 84336c2b1..cf5440156 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1115,20 +1115,21 @@ assert_circuit_ok(const circuit_t *c) edge_connection_t *conn; const or_circuit_t *or_circ = NULL; const origin_circuit_t *origin_circ = NULL; - circuit_t *nonconst_circ; tor_assert(c); tor_assert(c->magic == ORIGIN_CIRCUIT_MAGIC || c->magic == OR_CIRCUIT_MAGIC); tor_assert(c->purpose >= _CIRCUIT_PURPOSE_MIN && c->purpose <= _CIRCUIT_PURPOSE_MAX); - /* Having a separate variable for this pleases GCC 4.2 in ways I hop I never - * understand. -NM. */ - nonconst_circ = (circuit_t*) c; - if (CIRCUIT_IS_ORIGIN(c)) - origin_circ = TO_ORIGIN_CIRCUIT(nonconst_circ); - else - or_circ = TO_OR_CIRCUIT(nonconst_circ); + { + /* Having a separate variable for this pleases GCC 4.2 in ways I hope I + * never understand. -NM. */ + circuit_t *nonconst_circ = (circuit_t*) c; + if (CIRCUIT_IS_ORIGIN(c)) + origin_circ = TO_ORIGIN_CIRCUIT(nonconst_circ); + else + or_circ = TO_OR_CIRCUIT(nonconst_circ); + } if (c->n_conn) { tor_assert(!memcmp(c->n_conn->identity_digest, c->n_conn_id_digest, |