projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fixes all current issues with hashkit tests.
[m6w6/libmemcached]
/
libhashkit
/
fnv.c
diff --git
a/libhashkit/fnv.c
b/libhashkit/fnv.c
index fd171ceff3a407dfdab3c88a0ef8b42c5db4932a..fffb94a492aebf86815942322d9511f0825a7506 100644
(file)
--- a/
libhashkit/fnv.c
+++ b/
libhashkit/fnv.c
@@
-6,7
+6,7
@@
* the COPYING file in the parent directory for full text.
*/
* the COPYING file in the parent directory for full text.
*/
-#include
"common.h"
+#include
<libhashkit/common.h>
/* FNV hash'es lifted from Dustin Sallings work */
static uint64_t FNV_64_INIT= UINT64_C(0xcbf29ce484222325);
/* FNV hash'es lifted from Dustin Sallings work */
static uint64_t FNV_64_INIT= UINT64_C(0xcbf29ce484222325);
@@
-14,13
+14,13
@@
static uint64_t FNV_64_PRIME= UINT64_C(0x100000001b3);
static uint32_t FNV_32_INIT= 2166136261UL;
static uint32_t FNV_32_PRIME= 16777619;
static uint32_t FNV_32_INIT= 2166136261UL;
static uint32_t FNV_32_PRIME= 16777619;
-uint32_t hashkit_fnv1_64(const char *key, size_t key_length)
+uint32_t hashkit_fnv1_64(const char *key, size_t key_length
, void *context
)
{
/* Thanks to pierre@demartines.com for the pointer */
uint64_t hash= FNV_64_INIT;
{
/* Thanks to pierre@demartines.com for the pointer */
uint64_t hash= FNV_64_INIT;
-
size_t x= 0
;
+
(void)context
;
- for (x= 0; x < key_length; x++)
+ for (
size_t
x= 0; x < key_length; x++)
{
hash *= FNV_64_PRIME;
hash ^= (uint64_t)key[x];
{
hash *= FNV_64_PRIME;
hash ^= (uint64_t)key[x];
@@
-29,12
+29,12
@@
uint32_t hashkit_fnv1_64(const char *key, size_t key_length)
return (uint32_t)hash;
}
return (uint32_t)hash;
}
-uint32_t hashkit_fnv1a_64(const char *key, size_t key_length)
+uint32_t hashkit_fnv1a_64(const char *key, size_t key_length
, void *context
)
{
uint32_t hash= (uint32_t) FNV_64_INIT;
{
uint32_t hash= (uint32_t) FNV_64_INIT;
-
size_t x= 0
;
+
(void)context
;
- for (x= 0; x < key_length; x++)
+ for (
size_t
x= 0; x < key_length; x++)
{
uint32_t val= (uint32_t)key[x];
hash ^= val;
{
uint32_t val= (uint32_t)key[x];
hash ^= val;
@@
-44,12
+44,12
@@
uint32_t hashkit_fnv1a_64(const char *key, size_t key_length)
return hash;
}
return hash;
}
-uint32_t hashkit_fnv1_32(const char *key, size_t key_length)
+uint32_t hashkit_fnv1_32(const char *key, size_t key_length
, void *context
)
{
uint32_t hash= FNV_32_INIT;
{
uint32_t hash= FNV_32_INIT;
-
size_t x= 0
;
+
(void)context
;
- for (x= 0; x < key_length; x++)
+ for (
size_t
x= 0; x < key_length; x++)
{
uint32_t val= (uint32_t)key[x];
hash *= FNV_32_PRIME;
{
uint32_t val= (uint32_t)key[x];
hash *= FNV_32_PRIME;
@@
-59,12
+59,12
@@
uint32_t hashkit_fnv1_32(const char *key, size_t key_length)
return hash;
}
return hash;
}
-uint32_t hashkit_fnv1a_32(const char *key, size_t key_length)
+uint32_t hashkit_fnv1a_32(const char *key, size_t key_length
, void *context
)
{
uint32_t hash= FNV_32_INIT;
{
uint32_t hash= FNV_32_INIT;
-
size_t x= 0
;
+
(void)context
;
- for (x= 0; x < key_length; x++)
+ for (
size_t
x= 0; x < key_length; x++)
{
uint32_t val= (uint32_t)key[x];
hash ^= val;
{
uint32_t val= (uint32_t)key[x];
hash ^= val;