mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-24 12:23:32 +01:00
Switch a SMARTLIST_FOREACH in circuitbuild.c to BEGIN/END
It had some cpp stuff inside, and older GCCs don't like preprocessor directives inside macro arguments. Found by grarpamp.
This commit is contained in:
parent
cc33ac362b
commit
561ab14a5e
@ -4095,7 +4095,7 @@ choose_random_entry(cpath_build_state_t *state)
|
||||
|
||||
retry:
|
||||
smartlist_clear(live_entry_guards);
|
||||
SMARTLIST_FOREACH(entry_guards, entry_guard_t *, entry,
|
||||
SMARTLIST_FOREACH_BEGIN(entry_guards, entry_guard_t *, entry)
|
||||
{
|
||||
const char *msg;
|
||||
r = entry_is_live(entry, need_uptime, need_capacity, 0, &msg);
|
||||
@ -4131,7 +4131,8 @@ choose_random_entry(cpath_build_state_t *state)
|
||||
}
|
||||
if (smartlist_len(live_entry_guards) >= options->NumEntryGuards)
|
||||
break; /* we have enough */
|
||||
});
|
||||
}
|
||||
SMARTLIST_FOREACH_END(entry);
|
||||
|
||||
if (entry_list_is_constrained(options)) {
|
||||
/* If we prefer the entry nodes we've got, and we have at least
|
||||
|
Loading…
Reference in New Issue
Block a user