diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-04-09 21:36:45 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-04-09 21:36:45 +0000 |
| commit | 2a07919198f79622d40db564d1f99446613f925f (patch) | |
| tree | fe9ca74975ddbff2ac2a7e52ead376c8fbe600a5 /src/or/circuitlist.c | |
| parent | 2dc6019edbab37b8fabf80a9e72b0b0b65e98d31 (diff) | |
| download | tor-2a07919198f79622d40db564d1f99446613f925f.tar.gz tor-2a07919198f79622d40db564d1f99446613f925f.zip | |
r12326@catbus: nickm | 2007-04-09 17:36:41 -0400
Clean up crap from 9930. I can hardly wait till I trust SVK 2.x enough to upgrade.
svn:r9933
Diffstat (limited to 'src/or/circuitlist.c')
| -rw-r--r-- | src/or/circuitlist.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 7de520c41b..f887bbcf7f 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -157,12 +157,9 @@ void circuit_set_p_circid_orconn(or_circuit_t *circ, uint16_t id, or_connection_t *conn) { - int active; - int active; + int active = circ->p_conn_cells.n > 0; - active = circ->p_conn_cells.n > 0; tor_assert(bool_eq(active, circ->next_active_on_p_conn)); - active = circ->p_conn_cells.n > 0; circuit_set_circid_orconn_helper(TO_CIRCUIT(circ), CELL_DIRECTION_IN, id, conn, active); @@ -178,12 +175,9 @@ void circuit_set_n_circid_orconn(circuit_t *circ, uint16_t id, or_connection_t *conn) { - int active; - int active; + int active = circ->n_conn_cells.n > 0; - active = circ->n_conn_cells.n > 0; tor_assert(bool_eq(active, circ->next_active_on_n_conn)); - active = circ->n_conn_cells.n > 0; circuit_set_circid_orconn_helper(circ, CELL_DIRECTION_OUT, id, conn, active); |