diff options
| author | Roger Dingledine <arma@torproject.org> | 2006-03-12 04:07:21 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2006-03-12 04:07:21 +0000 |
| commit | 80f0492a6588bc40daa28db55f07b175cfff38a8 (patch) | |
| tree | fa28d7c1d6f2288fa97170102ce46b7325e6e0d2 /src/or/control.c | |
| parent | ef8939d5b37bcaeac0a3cf918e9d1d9351af7f37 (diff) | |
| download | tor-80f0492a6588bc40daa28db55f07b175cfff38a8.tar.gz tor-80f0492a6588bc40daa28db55f07b175cfff38a8.zip | |
avoid shadowing a variable so we don't get sad later.
svn:r6133
Diffstat (limited to 'src/or/control.c')
| -rw-r--r-- | src/or/control.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/control.c b/src/or/control.c index f40089cc1a..a6065dea91 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1831,12 +1831,12 @@ handle_control_attachstream(connection_t *conn, uint32_t len, /* Do we need to detach it first? */ if (ap_conn->state != AP_CONN_STATE_CONTROLLER_WAIT) { - circuit_t *circ = circuit_get_by_edge_conn(conn); + circuit_t *tmpcirc = circuit_get_by_edge_conn(conn); connection_edge_end(conn, END_STREAM_REASON_TIMEOUT, conn->cpath_layer); /* Un-mark it as ending, since we're going to reuse it. */ conn->has_sent_end = 0; - if (circ) - circuit_detach_stream(circ,conn); + if (tmpcirc) + circuit_detach_stream(tmpcirc,conn); conn->state = AP_CONN_STATE_CONTROLLER_WAIT; } |