diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-10-06 15:04:42 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-10-06 17:47:00 +0200 |
| commit | 0cb3c286883b694fc52a18a3b559ff98931641f3 (patch) | |
| tree | f8c3cf9104b3ea8fc180bd1de1e72119dfe4524e /src/basic/hashmap.c | |
| parent | 8c60d978bd3453659bfa7f4d90a17ba5fa3e0774 (diff) | |
siphash24: unify API
Make the API of the new helpers more similar to the old wrapper.
In particular we now return the hash as a byte string to avoid
any endianness problems.
Diffstat (limited to 'src/basic/hashmap.c')
| -rw-r--r-- | src/basic/hashmap.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/basic/hashmap.c b/src/basic/hashmap.c index 3e17ed30df..20e7e51d9e 100644 --- a/src/basic/hashmap.c +++ b/src/basic/hashmap.c @@ -372,12 +372,15 @@ static uint8_t *hash_key(HashmapBase *h) { static unsigned base_bucket_hash(HashmapBase *h, const void *p) { struct siphash state; + uint64_t hash; - siphash_init(&state, hash_key(h)); + siphash24_init(&state, hash_key(h)); h->hash_ops->hash(p, &state); - return (unsigned) (siphash24_finalize(&state) % n_buckets(h)); + siphash24_finalize((uint8_t*)&hash, &state); + + return (unsigned) (hash % n_buckets(h)); } #define bucket_hash(h, p) base_bucket_hash(HASHMAP_BASE(h), p) |