[or-cvs] avoid shadowing a variable so we don"t get sad later.

[arma at seul.org]

Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or

Modified Files:
	control.c 
Log Message:
avoid shadowing a variable so we don't get sad later.


Index: control.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/control.c,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -p -d -r1.175 -r1.176
--- control.c	9 Mar 2006 06:29:53 -0000	1.175
+++ control.c	12 Mar 2006 04:07:21 -0000	1.176
@@ -1831,12 +1831,12 @@ handle_control_attachstream(connection_t
 
   /* 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;
   }