X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Furcu%2Frculfhash.h;fp=include%2Furcu%2Frculfhash.h;h=284dab03041a30a96246bb9ca617abd73e72ecee;hb=220d1a7fc2af7d204a23b3fb9ece3fa7d9d8a518;hp=c18cf5290763dde5f86efe101adf0c1af72f8857;hpb=26dc986ad3b7f6506eec8544e2f9bf1f80731212;p=urcu.git

diff --git a/include/urcu/rculfhash.h b/include/urcu/rculfhash.h
index c18cf52..284dab0 100644
--- a/include/urcu/rculfhash.h
+++ b/include/urcu/rculfhash.h
@@ -534,24 +534,30 @@ void cds_lfht_resize(struct cds_lfht *ht, unsigned long new_size);
 		cds_lfht_next_duplicate(ht, match, key, iter),		\
 			node = cds_lfht_iter_get_node(iter))
 
+#define cds_lfht_entry(ptr, type, member)				\
+	({								\
+		caa_unqual_scalar_typeof(ptr) ___ptr = (ptr);		\
+		___ptr ? caa_container_of(___ptr, type, member) : NULL;	\
+	})
+
 #define cds_lfht_for_each_entry(ht, iter, pos, member)			\
 	for (cds_lfht_first(ht, iter),					\
-			pos = caa_container_of(cds_lfht_iter_get_node(iter), \
-					__typeof__(*(pos)), member);	\
-		cds_lfht_iter_get_node(iter) != NULL;			\
+			pos = cds_lfht_entry(cds_lfht_iter_get_node(iter), \
+				__typeof__(*(pos)), member);		\
+		pos != NULL;						\
 		cds_lfht_next(ht, iter),				\
-			pos = caa_container_of(cds_lfht_iter_get_node(iter), \
-					__typeof__(*(pos)), member))
+			pos = cds_lfht_entry(cds_lfht_iter_get_node(iter), \
+				__typeof__(*(pos)), member))
 
 #define cds_lfht_for_each_entry_duplicate(ht, hash, match, key,		\
 				iter, pos, member)			\
 	for (cds_lfht_lookup(ht, hash, match, key, iter),		\
-			pos = caa_container_of(cds_lfht_iter_get_node(iter), \
-					__typeof__(*(pos)), member);	\
-		cds_lfht_iter_get_node(iter) != NULL;			\
+			pos = cds_lfht_entry(cds_lfht_iter_get_node(iter), \
+				__typeof__(*(pos)), member);		\
+		pos != NULL;						\
 		cds_lfht_next_duplicate(ht, match, key, iter),		\
-			pos = caa_container_of(cds_lfht_iter_get_node(iter), \
-					__typeof__(*(pos)), member))
+			pos = cds_lfht_entry(cds_lfht_iter_get_node(iter), \
+				__typeof__(*(pos)), member))
 
 #ifdef __cplusplus
 }