Commit f3c7eeb4 authored by Nick Mathewson's avatar Nick Mathewson 🎨
Browse files

r15843@catbus: nickm | 2007-10-16 09:58:49 -0400

 Clean up our code to fix a warning under gcc 4.2


svn:r11982
parent 583c15d0
......@@ -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,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment