summaryrefslogtreecommitdiff
path: root/src/or/circpathbias.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/circpathbias.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/circpathbias.c')
-rw-r--r--src/or/circpathbias.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/circpathbias.c b/src/or/circpathbias.c
index 51a75cf502..59024abd12 100644
--- a/src/or/circpathbias.c
+++ b/src/or/circpathbias.c
@@ -1140,11 +1140,10 @@ pathbias_count_circs_in_states(entry_guard_t *guard,
path_state_t from,
path_state_t to)
{
- circuit_t *circ;
int open_circuits = 0;
/* Count currently open circuits. Give them the benefit of the doubt. */
- TOR_LIST_FOREACH(circ, circuit_get_global_list(), head) {
+ SMARTLIST_FOREACH_BEGIN(circuit_get_global_list(), circuit_t *, circ) {
origin_circuit_t *ocirc = NULL;
if (!CIRCUIT_IS_ORIGIN(circ) || /* didn't originate here */
circ->marked_for_close) /* already counted */
@@ -1167,6 +1166,7 @@ pathbias_count_circs_in_states(entry_guard_t *guard,
open_circuits++;
}
}
+ SMARTLIST_FOREACH_END(circ);
return open_circuits;
}