diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-10-04 00:22:41 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-10-05 18:22:10 +0200 |
| commit | b826ab586c9e0a9c0d438a75c28cf3a8ab485929 (patch) | |
| tree | 198d9f30b924468fc7d7dbf5fe9f05ce73809269 /src/test/test-hashmap-plain.c | |
| parent | 57217c8f2a2dea07b41ecf05000172ce77a90466 (diff) | |
hashmap: refactor hash_func
All our hash functions are based on siphash24(), factor out
siphash_init() and siphash24_finalize() and pass the siphash
state to the hash functions rather than the hash key.
This simplifies the hash functions, and in particular makes
composition simpler as calling siphash24_compress() repeatedly
on separate chunks of input has the same effect as first
concatenating the input and then calling siphash23_compress()
on the result.
Diffstat (limited to 'src/test/test-hashmap-plain.c')
| -rw-r--r-- | src/test/test-hashmap-plain.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/test-hashmap-plain.c b/src/test/test-hashmap-plain.c index 33ac93b395..78f9c19f5b 100644 --- a/src/test/test-hashmap-plain.c +++ b/src/test/test-hashmap-plain.c @@ -692,8 +692,8 @@ static void test_hashmap_get2(void) { hashmap_free_free_free(m); } -static unsigned long crippled_hashmap_func(const void *p, const uint8_t hash_key[HASH_KEY_SIZE]) { - return trivial_hash_func(INT_TO_PTR(PTR_TO_INT(p) & 0xff), hash_key); +static void crippled_hashmap_func(const void *p, struct siphash *state) { + return trivial_hash_func(INT_TO_PTR(PTR_TO_INT(p) & 0xff), state); } static const struct hash_ops crippled_hashmap_ops = { |