diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-12 19:25:14 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-12 19:25:14 -0400 |
| commit | 59a6df8882cbb404a5d22d99ce99684348aea8c8 (patch) | |
| tree | b7be88ea50c4a71201ae940dec2dbd490faf0b78 /src/common/container.c | |
| parent | 379de3d10acd45f02aa6c64f54de9b7faa634df5 (diff) | |
| parent | 8fb38331c3213caef2d2e003e02cdb361504f14f (diff) | |
| download | tor-59a6df8882cbb404a5d22d99ce99684348aea8c8.tar tor-59a6df8882cbb404a5d22d99ce99684348aea8c8.tar.gz | |
Merge remote-tracking branch 'public/bug3122_memcmp_022' into maint-0.2.2
Diffstat (limited to 'src/common/container.c')
| -rw-r--r-- | src/common/container.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/common/container.c b/src/common/container.c index 7208d3680..09d4bb131 100644 --- a/src/common/container.c +++ b/src/common/container.c @@ -216,7 +216,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) @@ -224,7 +224,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; } @@ -802,7 +802,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. */ @@ -824,7 +824,7 @@ smartlist_uniq_digests(smartlist_t *sl) static int _compare_digests256(const void **_a, const void **_b) { - return memcmp((const char*)*_a, (const char*)*_b, DIGEST256_LEN); + return tor_memcmp((const char*)*_a, (const char*)*_b, DIGEST256_LEN); } /** Sort the list of DIGEST256_LEN-byte digests into ascending order. */ @@ -886,7 +886,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. */ |