X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fhtable%2Fhtable.h;h=938b43afc89ce5a6603c45761da17d26b748475e;hb=e16aa40bed387c9575bc9c5d1b19ecca0e9cbda7;hp=28755d617d67b7766d44fe3e5ce93d7956a85d55;hpb=7a353c03e5e8cdd55cbc0917f9ecff5cf9beefdb;p=ccan diff --git a/ccan/htable/htable.h b/ccan/htable/htable.h index 28755d61..938b43af 100644 --- a/ccan/htable/htable.h +++ b/ccan/htable/htable.h @@ -24,11 +24,10 @@ struct htable { size_t (*rehash)(const void *elem, void *priv); void *priv; - unsigned int bits; - size_t elems, deleted, max, max_with_deleted; + unsigned int bits, perfect_bitnum; + size_t elems, 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; }; @@ -50,7 +49,7 @@ struct htable { * static struct htable ht = HTABLE_INITIALIZER(ht, rehash, NULL); */ #define HTABLE_INITIALIZER(name, rehash, priv) \ - { rehash, priv, 0, 0, 0, 0, 0, -1, 0, 0, &name.perfect_bit } + { rehash, priv, 0, 0, 0, 0, -1, 0, &name.common_bits } /** * htable_init - initialize an empty hash table.