lib/ccan/htable: HTABLE_INITIALIZER() for static initialization.

Unfortunately it's a bit of a pain to use for typed hashtables, but it
works.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit 60cc720d0797fc49325437ea36a9ffd909c75ed0)

1 files changed, 2 insertions, 10 deletions

diff --git a/lib/ccan/htable/htable.c b/lib/ccan/htable/htable.c
index f3e529211d..0a01ead897 100644
--- a/lib/ccan/htable/htable.c
+++ b/lib/ccan/htable/htable.c
@@ -45,18 +45,10 @@ static inline uintptr_t get_hash_ptr_bits(const struct htable *ht,
 void htable_init(struct htable *ht,
 		 size_t (*rehash)(const void *elem, void *priv), void *priv)
 {
-	ht->bits = 0;
+	struct htable empty = HTABLE_INITIALIZER(empty, NULL, NULL);
+	*ht = empty;
 	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;
 }