X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=src%2Fhashtable.h;h=5aed14f2ef61855fe865828a773f0807be763d5e;hb=dd7dd414f0968a2ca6436c493b4d1d4ed0723bda;hp=6d3c736f505ba7971c46b385d28898320503f22a;hpb=8d75235ff22dc4aced697e198c3c024f1f4b88fe;p=jansson.git diff --git a/src/hashtable.h b/src/hashtable.h index 6d3c736..5aed14f 100644 --- a/src/hashtable.h +++ b/src/hashtable.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010 Petri Lehtinen + * Copyright (c) 2009-2011 Petri Lehtinen * * This library is free software; you can redistribute it and/or modify * it under the terms of the MIT license. See LICENSE for details. @@ -8,7 +8,7 @@ #ifndef HASHTABLE_H #define HASHTABLE_H -typedef unsigned int (*key_hash_fn)(const void *key); +typedef size_t (*key_hash_fn)(const void *key); typedef int (*key_cmp_fn)(const void *key1, const void *key2); typedef void (*free_fn)(void *key); @@ -20,7 +20,7 @@ struct hashtable_list { struct hashtable_pair { void *key; void *value; - unsigned int hash; + size_t hash; struct hashtable_list list; }; @@ -30,9 +30,9 @@ struct hashtable_bucket { }; typedef struct hashtable { - unsigned int size; + size_t size; struct hashtable_bucket *buckets; - unsigned int num_buckets; /* index to primes[] */ + size_t num_buckets; /* index to primes[] */ struct hashtable_list list; key_hash_fn hash_key; @@ -161,7 +161,7 @@ void hashtable_clear(hashtable_t *hashtable); void *hashtable_iter(hashtable_t *hashtable); /** - * hashtable_iter - Return an iterator at a specific key + * hashtable_iter_at - Return an iterator at a specific key * * @hashtable: The hashtable object * @key: The key that the iterator should point to