X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=include%2Furcu%2Frculfhash.h;fp=include%2Furcu%2Frculfhash.h;h=cbbc3b9e2cabe19966e7a1c3b74f63472882b209;hp=16f7d1cdaa433d47f72aecd31a20b3a99cc2a8fe;hb=0ef4782c2a106e09f2103b2b110a03e307d6aca8;hpb=4b3a7ebd5597b5e241c39110eb426f7832066308

diff --git a/include/urcu/rculfhash.h b/include/urcu/rculfhash.h
index 16f7d1c..cbbc3b9 100644
--- a/include/urcu/rculfhash.h
+++ b/include/urcu/rculfhash.h
@@ -545,10 +545,7 @@ void cds_lfht_resize(struct cds_lfht *ht, unsigned long new_size);
 			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;	\
-	})
+	caa_container_of_check_null(ptr, type, member)
 
 #define cds_lfht_for_each_entry(ht, iter, pos, member)			\
 	for (cds_lfht_first(ht, iter),					\