From f3538fc7cbe97e7e0daa216b187596d77f189bf2 Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Tue, 31 May 2016 12:06:16 -0400 Subject: [PATCH] htable/htable_type: allow keyof to be a simple macro Without this, one had to either use a function or a macro with casts to get the expected behavior. Signed-off-by: Cody P Schafer --- ccan/htable/htable_type.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ccan/htable/htable_type.h b/ccan/htable/htable_type.h index 61535c2c..15a70fc2 100644 --- a/ccan/htable/htable_type.h +++ b/ccan/htable/htable_type.h @@ -81,7 +81,7 @@ return htable_del(&ht->raw, hashfn(keyof(elem)), elem); \ } \ static inline UNNEEDED type *name##_get(const struct name *ht, \ - const HTABLE_KTYPE(keyof) k) \ + const HTABLE_KTYPE(keyof, type) k) \ { \ /* Typecheck for eqfn */ \ (void)sizeof(eqfn((const type *)NULL, \ @@ -92,7 +92,7 @@ k); \ } \ static inline UNNEEDED type *name##_getmatch_(const struct name *ht, \ - const HTABLE_KTYPE(keyof) k, \ + const HTABLE_KTYPE(keyof, type) k, \ size_t h, \ type *v, \ struct name##_iter *iter) \ @@ -105,7 +105,7 @@ return v; \ } \ static inline UNNEEDED type *name##_getfirst(const struct name *ht, \ - const HTABLE_KTYPE(keyof) k, \ + const HTABLE_KTYPE(keyof, type) k, \ struct name##_iter *iter) \ { \ size_t h = hashfn(k); \ @@ -113,7 +113,7 @@ return name##_getmatch_(ht, k, h, v, iter); \ } \ static inline UNNEEDED type *name##_getnext(const struct name *ht, \ - const HTABLE_KTYPE(keyof) k, \ + const HTABLE_KTYPE(keyof, type) k, \ struct name##_iter *iter) \ { \ size_t h = hashfn(k); \ @@ -121,7 +121,7 @@ return name##_getmatch_(ht, k, h, v, iter); \ } \ static inline UNNEEDED bool name##_delkey(struct name *ht, \ - const HTABLE_KTYPE(keyof) k) \ + const HTABLE_KTYPE(keyof, type) k) \ { \ type *elem = name##_get(ht, k); \ if (elem) \ @@ -140,8 +140,8 @@ } #if HAVE_TYPEOF -#define HTABLE_KTYPE(keyof) typeof(keyof(NULL)) +#define HTABLE_KTYPE(keyof, type) typeof(keyof((const type *)NULL)) #else -#define HTABLE_KTYPE(keyof) void * +#define HTABLE_KTYPE(keyof, type) void * #endif #endif /* CCAN_HTABLE_TYPE_H */ -- 2.39.2