X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Furcu%2Frculfhash.h;fp=include%2Furcu%2Frculfhash.h;h=56c1b13d31eea723fa46808a2295f45465393bab;hb=f469420bf77f07598747b78cc73404f1751ae2f0;hp=284dab03041a30a96246bb9ca617abd73e72ecee;hpb=2a17fe10ad97e997981a98463a4cbda9b4a933a5;p=urcu.git

diff --git a/include/urcu/rculfhash.h b/include/urcu/rculfhash.h
index 284dab0..56c1b13 100644
--- a/include/urcu/rculfhash.h
+++ b/include/urcu/rculfhash.h
@@ -535,10 +535,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),					\