diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-12 19:20:40 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-12 19:20:40 -0400 |
| commit | 1f678277a17d06941ac59ebfe25502d6a160d4ef (patch) | |
| tree | 5a86beffb8000d54c8b27bd031a1da663779e5c4 /src/common/container.c | |
| parent | d1c7f65a8e76b594c63bf23baf7fb6c19ba44c00 (diff) | |
| parent | 59f9097d5c3dc010847c359888d31757d1c97904 (diff) | |
| download | tor-1f678277a17d06941ac59ebfe25502d6a160d4ef.tar tor-1f678277a17d06941ac59ebfe25502d6a160d4ef.tar.gz | |
Merge remote-tracking branch 'public/bug3122_memcmp_squashed' into maint-0.2.1
Diffstat (limited to 'src/common/container.c')
| -rw-r--r-- | src/common/container.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/container.c b/src/common/container.c index 977d60407..c741eb020 100644 --- a/src/common/container.c +++ b/src/common/container.c @@ -215,7 +215,7 @@ smartlist_string_num_isin(const smartlist_t *sl, int num) } /** Return true iff <b>sl</b> has some element E such that - * !memcmp(E,<b>element</b>,DIGEST_LEN) + * tor_memeq(E,<b>element</b>,DIGEST_LEN) */ int smartlist_digest_isin(const smartlist_t *sl, const char *element) @@ -223,7 +223,7 @@ smartlist_digest_isin(const smartlist_t *sl, const char *element) int i; if (!sl) return 0; for (i=0; i < sl->num_used; i++) - if (memcmp((const char*)sl->list[i],element,DIGEST_LEN)==0) + if (tor_memeq((const char*)sl->list[i],element,DIGEST_LEN)) return 1; return 0; } @@ -663,7 +663,7 @@ smartlist_pqueue_assert_ok(smartlist_t *sl, static int _compare_digests(const void **_a, const void **_b) { - return memcmp((const char*)*_a, (const char*)*_b, DIGEST_LEN); + return tor_memcmp((const char*)*_a, (const char*)*_b, DIGEST_LEN); } /** Sort the list of DIGEST_LEN-byte digests into ascending order. */ @@ -716,7 +716,7 @@ strmap_entry_hash(const strmap_entry_t *a) static INLINE int digestmap_entries_eq(const digestmap_entry_t *a, const digestmap_entry_t *b) { - return !memcmp(a->key, b->key, DIGEST_LEN); + return tor_memeq(a->key, b->key, DIGEST_LEN); } /** Helper: return a hash value for a digest_map_t. */ |