diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-04-11 12:50:50 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-01-16 16:57:11 -0500 |
| commit | 49e619c1cf7ed62334263a89eb031899bc2e7178 (patch) | |
| tree | b16cd982baa62c80db14d3671c7c1a355794239a /src/or/entrynodes.c | |
| parent | e4821fa14de6d76219d4e5c1a320ba263bd5e46d (diff) | |
| download | tor-49e619c1cf7ed62334263a89eb031899bc2e7178.tar.gz tor-49e619c1cf7ed62334263a89eb031899bc2e7178.zip | |
Rename *_isin to *_contains
This is an automatically generated commit, from the following perl script,
run with the options "-w -i -p".
s/smartlist_string_num_isin/smartlist_contains_int_as_string/g;
s/smartlist_string_isin((?:_case)?)/smartlist_contains_string$1/g;
s/smartlist_digest_isin/smartlist_contains_digest/g;
s/smartlist_isin/smartlist_contains/g;
s/digestset_isin/digestset_contains/g;
Diffstat (limited to 'src/or/entrynodes.c')
| -rw-r--r-- | src/or/entrynodes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 035f3ca8cd..3e58371643 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -762,7 +762,7 @@ entry_guards_set_from_config(const or_options_t *options) smartlist_add(entry_fps, (void*)node->identity)); SMARTLIST_FOREACH(entry_guards, entry_guard_t *, e, { - if (smartlist_digest_isin(entry_fps, e->identity)) + if (smartlist_contains_digest(entry_fps, e->identity)) smartlist_add(old_entry_guards_on_list, e); else smartlist_add(old_entry_guards_not_on_list, e); @@ -901,7 +901,7 @@ choose_random_entry_impl(cpath_build_state_t *state, int for_directory, } if (node == chosen_exit) continue; /* don't pick the same node for entry and exit */ - if (consider_exit_family && smartlist_isin(exit_family, node)) + if (consider_exit_family && smartlist_contains(exit_family, node)) continue; /* avoid relays that are family members of our exit */ #if 0 /* since EntryNodes is always strict now, this clause is moot */ if (options->EntryNodes && |