aboutsummaryrefslogtreecommitdiff
path: root/src/or/rendclient.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-08-15 16:23:22 -0400
committerNick Mathewson <nickm@torproject.org>2014-08-15 16:23:22 -0400
commit6969bd9a02895ae7dc80264fb59adba4a44f79a1 (patch)
tree3d552065414cc5ffe8cb0839c5cdd84325cb9d0f /src/or/rendclient.c
parentdb2af2abb03a82e7c71581efa04a45869feba38a (diff)
downloadtor-6969bd9a02895ae7dc80264fb59adba4a44f79a1.tar.gz
tor-6969bd9a02895ae7dc80264fb59adba4a44f79a1.zip
Autoconvert most circuit-list iterations to smartlist iterations
Breaks compilation. Used this coccinelle script: @@ identifier c; typedef circuit_t; iterator name TOR_LIST_FOREACH; iterator name SMARTLIST_FOREACH_BEGIN; statement S; @@ - circuit_t *c; ... - TOR_LIST_FOREACH(c, \(&global_circuitlist\|circuit_get_global_list()\), head) + SMARTLIST_FOREACH_BEGIN(circuit_get_global_list(), circuit_t *, c) S + SMARTLIST_FOREACH_END(c);
Diffstat (limited to 'src/or/rendclient.c')
-rw-r--r--src/or/rendclient.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index d42024010d..fa4dc0d9c9 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -376,9 +376,8 @@ rend_client_rendcirc_has_opened(origin_circuit_t *circ)
static void
rend_client_close_other_intros(const char *onion_address)
{
- circuit_t *c;
/* abort parallel intro circs, if any */
- TOR_LIST_FOREACH(c, circuit_get_global_list(), head) {
+ SMARTLIST_FOREACH_BEGIN(circuit_get_global_list(), circuit_t *, c) {
if ((c->purpose == CIRCUIT_PURPOSE_C_INTRODUCING ||
c->purpose == CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT) &&
!c->marked_for_close && CIRCUIT_IS_ORIGIN(c)) {
@@ -393,6 +392,7 @@ rend_client_close_other_intros(const char *onion_address)
}
}
}
+ SMARTLIST_FOREACH_END(c);
}
/** Called when get an ACK or a NAK for a REND_INTRODUCE1 cell.