mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-12-06 19:41:15 +01:00
Automated conversion of memcmp to tor_memcmp/tor_mem[n]eq
This commit is _exactly_ the result of perl -i -pe 's/\bmemcmp\(/tor_memcmp\(/g' src/*/*.[ch] perl -i -pe 's/\!\s*tor_memcmp\(/tor_memeq\(/g' src/*/*.[ch] perl -i -pe 's/0\s*==\s*tor_memcmp\(/tor_memeq\(/g' src/*/*.[ch] perl -i -pe 's/0\s*!=\s*tor_memcmp\(/tor_memneq\(/g' src/*/*.[ch] git checkout src/common/di_ops.[ch] git checkout src/or/test.c git checkout src/common/test.h
This commit is contained in:
@@ -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_memcmp((const char*)sl->list[i],element,DIGEST_LEN)==0)
|
||||
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. */
|
||||
|
||||
Reference in New Issue
Block a user