From 0ac7deefbf190e11d38cc47807e0f5f6cfb1775e Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 5 Dec 2011 16:42:47 +1030 Subject: lib/ccan/htable: clean up interface, document htable_type better. We change from htable_new()/htable_free() to htable_init/htable_clear. We also change HTABLE_DEFINE_TYPE() to be the full name, without automatically prepending htable_. Signed-off-by: Rusty Russell (Imported from CCAN commit 0c3590dc33d644f73bb8587db454c491830aaf26) --- lib/ccan/htable/htable.c | 50 ++++++++++++++++-------------------------------- 1 file changed, 17 insertions(+), 33 deletions(-) (limited to 'lib/ccan/htable/htable.c') diff --git a/lib/ccan/htable/htable.c b/lib/ccan/htable/htable.c index ba5f0de530..f3e529211d 100644 --- a/lib/ccan/htable/htable.c +++ b/lib/ccan/htable/htable.c @@ -1,7 +1,6 @@ /* Licensed under LGPLv2+ - see LICENSE file for details */ #include #include -#include #include #include #include @@ -10,17 +9,6 @@ /* We use 0x1 as deleted marker. */ #define HTABLE_DELETED (0x1) -struct htable { - size_t (*rehash)(const void *elem, void *priv); - void *priv; - unsigned int bits; - size_t elems, deleted, max, max_with_deleted; - /* These are the bits which are the same in all pointers. */ - uintptr_t common_mask, common_bits; - uintptr_t perfect_bit; - uintptr_t *table; -}; - /* We clear out the bits which are always the same, and put metadata there. */ static inline uintptr_t get_extra_ptr_bits(const struct htable *ht, uintptr_t e) @@ -54,33 +42,29 @@ static inline uintptr_t get_hash_ptr_bits(const struct htable *ht, & ht->common_mask & ~ht->perfect_bit; } -struct htable *htable_new(size_t (*rehash)(const void *elem, void *priv), - void *priv) +void htable_init(struct htable *ht, + size_t (*rehash)(const void *elem, void *priv), void *priv) { - struct htable *ht = malloc(sizeof(struct htable)); - if (ht) { - ht->bits = 0; - ht->rehash = rehash; - ht->priv = priv; - ht->elems = 0; - ht->deleted = 0; - ht->max = 0; - ht->max_with_deleted = 0; - /* This guarantees we enter update_common first add. */ - ht->common_mask = -1; - ht->common_bits = 0; - ht->perfect_bit = 0; - /* Dummy table until first insert. */ - ht->table = &ht->perfect_bit; - } - return ht; + ht->bits = 0; + ht->rehash = rehash; + ht->priv = priv; + ht->elems = 0; + ht->deleted = 0; + ht->max = 0; + ht->max_with_deleted = 0; + /* This guarantees we enter update_common first add. */ + ht->common_mask = -1; + ht->common_bits = 0; + ht->perfect_bit = 0; + /* Dummy table until first insert. */ + ht->table = &ht->perfect_bit; } -void htable_free(const struct htable *ht) +void htable_clear(struct htable *ht) { if (ht->table != &ht->perfect_bit) free((void *)ht->table); - free((void *)ht); + htable_init(ht, ht->rehash, ht->priv); } static size_t hash_bucket(const struct htable *ht, size_t h) -- cgit