X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=libhashkit%2Ffnv.c;h=fffb94a492aebf86815942322d9511f0825a7506;hb=1c26bb24f73e277073ca3dc266c78a19fc954e21;hp=fd171ceff3a407dfdab3c88a0ef8b42c5db4932a;hpb=55b5455291498ef63c1c34976552d58708a74732;p=m6w6%2Flibmemcached diff --git a/libhashkit/fnv.c b/libhashkit/fnv.c index fd171cef..fffb94a4 100644 --- a/libhashkit/fnv.c +++ b/libhashkit/fnv.c @@ -6,7 +6,7 @@ * the COPYING file in the parent directory for full text. */ -#include "common.h" +#include /* 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; -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; - 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]; @@ -29,12 +29,12 @@ uint32_t hashkit_fnv1_64(const char *key, size_t key_length) 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; - 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; @@ -44,12 +44,12 @@ uint32_t hashkit_fnv1a_64(const char *key, size_t key_length) 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; - 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; @@ -59,12 +59,12 @@ uint32_t hashkit_fnv1_32(const char *key, size_t key_length) 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; - 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;