sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

r15842@catbus: nickm | 2007-10-16 09:58:33 -0400 

Backport warning-suppression for gcc 4.2.


svn:r11981
This commit is contained in:
Nick Mathewson 2007-10-16 13:59:34 +00:00
parent a58ba03b85
commit 427eb4649b
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/or/circuitlist.c
View File

@ -1056,10 +1056,15 @@ assert_circuit_ok(const circuit_t *c)
tor_assert(c->purpose >= _CIRCUIT_PURPOSE_MIN &&
c->purpose <= _CIRCUIT_PURPOSE_MAX);
if (CIRCUIT_IS_ORIGIN(c))
origin_circ = TO_ORIGIN_CIRCUIT((circuit_t*)c);
else
or_circ = TO_OR_CIRCUIT((circuit_t*)c);
{
/* 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,