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/common/container.h | |
| 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/common/container.h')
| -rw-r--r-- | src/common/container.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/common/container.h b/src/common/container.h index d204fa4cca..e247fb7ea6 100644 --- a/src/common/container.h +++ b/src/common/container.h @@ -35,13 +35,13 @@ void smartlist_remove(smartlist_t *sl, const void *element); void *smartlist_pop_last(smartlist_t *sl); void smartlist_reverse(smartlist_t *sl); void smartlist_string_remove(smartlist_t *sl, const char *element); -int smartlist_isin(const smartlist_t *sl, const void *element); -int smartlist_string_isin(const smartlist_t *sl, const char *element); +int smartlist_contains(const smartlist_t *sl, const void *element); +int smartlist_contains_string(const smartlist_t *sl, const char *element); int smartlist_string_pos(const smartlist_t *, const char *elt); -int smartlist_string_isin_case(const smartlist_t *sl, const char *element); -int smartlist_string_num_isin(const smartlist_t *sl, int num); +int smartlist_contains_string_case(const smartlist_t *sl, const char *element); +int smartlist_contains_int_as_string(const smartlist_t *sl, int num); int smartlist_strings_eq(const smartlist_t *sl1, const smartlist_t *sl2); -int smartlist_digest_isin(const smartlist_t *sl, const char *element); +int smartlist_contains_digest(const smartlist_t *sl, const char *element); int smartlist_overlap(const smartlist_t *sl1, const smartlist_t *sl2); void smartlist_intersect(smartlist_t *sl1, const smartlist_t *sl2); void smartlist_subtract(smartlist_t *sl1, const smartlist_t *sl2); @@ -623,7 +623,7 @@ digestset_add(digestset_t *set, const char *digest) /** If <b>digest</b> is in <b>set</b>, return nonzero. Otherwise, * <em>probably</em> return zero. */ static INLINE int -digestset_isin(const digestset_t *set, const char *digest) +digestset_contains(const digestset_t *set, const char *digest) { const uint32_t *p = (const uint32_t *)digest; const uint32_t d1 = p[0] + (p[1]>>16); |