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/router.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/router.c')
| -rw-r--r-- | src/or/router.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/router.c b/src/or/router.c index 1057973dbb..c584d6277f 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1858,7 +1858,7 @@ router_rebuild_descriptor(int force) member = node_get_by_nickname(name, 1); if (!member) { int is_legal = is_legal_nickname_or_hexdigest(name); - if (!smartlist_string_isin(warned_nonexistent_family, name) && + if (!smartlist_contains_string(warned_nonexistent_family, name) && !is_legal_hexdigest(name)) { if (is_legal) log_warn(LD_CONFIG, @@ -1884,7 +1884,7 @@ router_rebuild_descriptor(int force) base16_encode(fp+1,HEX_DIGEST_LEN+1, member->identity, DIGEST_LEN); smartlist_add(ri->declared_family, fp); - if (smartlist_string_isin(warned_nonexistent_family, name)) + if (smartlist_contains_string(warned_nonexistent_family, name)) smartlist_string_remove(warned_nonexistent_family, name); } skip: |