From b8ed8b124aaff754e244dff6930b36c192fa69e0 Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Tue, 14 Jan 2014 12:20:25 -0500 Subject: src/libudev: bring in line with upstream Signed-off-by: Anthony G. Basile --- src/libudev/hashmap.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/libudev/hashmap.h') diff --git a/src/libudev/hashmap.h b/src/libudev/hashmap.h index 3b65142eca..387c32243e 100644 --- a/src/libudev/hashmap.h +++ b/src/libudev/hashmap.h @@ -30,6 +30,8 @@ * for all read operations. That way it is not necessary to * instantiate an object for each Hashmap use. */ +#define HASH_KEY_SIZE 16 + typedef struct Hashmap Hashmap; typedef struct _IteratorStruct _IteratorStruct; typedef _IteratorStruct* Iterator; @@ -37,16 +39,16 @@ typedef _IteratorStruct* Iterator; #define ITERATOR_FIRST ((Iterator) 0) #define ITERATOR_LAST ((Iterator) -1) -typedef unsigned (*hash_func_t)(const void *p); +typedef unsigned long (*hash_func_t)(const void *p, const uint8_t hash_key[HASH_KEY_SIZE]); typedef int (*compare_func_t)(const void *a, const void *b); -unsigned string_hash_func(const void *p) _pure_; +unsigned long string_hash_func(const void *p, const uint8_t hash_key[HASH_KEY_SIZE]) _pure_; int string_compare_func(const void *a, const void *b) _pure_; /* This will compare the passed pointers directly, and will not * dereference them. This is hence not useful for strings or * suchlike. */ -unsigned trivial_hash_func(const void *p) _const_; +unsigned long trivial_hash_func(const void *p, const uint8_t hash_key[HASH_KEY_SIZE]) _pure_; int trivial_compare_func(const void *a, const void *b) _const_; Hashmap *hashmap_new(hash_func_t hash_func, compare_func_t compare_func); -- cgit v1.2.3-54-g00ecf