aboutsummaryrefslogtreecommitdiff
path: root/src/or/relay.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2007-05-16 22:15:14 +0000
committerNick Mathewson <nickm@torproject.org>2007-05-16 22:15:14 +0000
commitb837191fd0e897cbc5fc33874190bab8bbb83268 (patch)
tree96b7bf77047a1873c56931c4f1387cd3c36f79c8 /src/or/relay.c
parente043b86f47185e0d9df53dab12d42e46c8c35b83 (diff)
downloadtor-b837191fd0e897cbc5fc33874190bab8bbb83268.tar.gz
tor-b837191fd0e897cbc5fc33874190bab8bbb83268.zip
r12768@catbus: nickm | 2007-05-16 17:25:33 -0400
Fix GCC warnings related to local parameters/variables getting shadowed. svn:r10198
Diffstat (limited to 'src/or/relay.c')
-rw-r--r--src/or/relay.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/relay.c b/src/or/relay.c
index 514f6210c0..469741f95b 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -1116,8 +1116,9 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ,
return 0;
}
if (circ->n_conn) {
- uint8_t reason = *(uint8_t*)(cell->payload + RELAY_HEADER_SIZE);
- connection_or_send_destroy(circ->n_circ_id, circ->n_conn, reason);
+ uint8_t trunc_reason = *(uint8_t*)(cell->payload + RELAY_HEADER_SIZE);
+ connection_or_send_destroy(circ->n_circ_id, circ->n_conn,
+ trunc_reason);
circuit_set_n_circid_orconn(circ, 0, NULL);
}
log_debug(LD_EXIT, "Processed 'truncate', replying.");