X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fhtable%2Fhtable.c;h=0a01ead8978ad4c4e914a37dbe029c2ef1219004;hp=f3e529211d5b2456bad5165d3baa848de4314d3d;hb=614259f13c3e694fcd6b57fc05a329066e43c76d;hpb=0c3590dc33d644f73bb8587db454c491830aaf26

diff --git a/ccan/htable/htable.c b/ccan/htable/htable.c
index f3e52921..0a01ead8 100644
--- a/ccan/htable/htable.c
+++ b/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;
 }