X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=include%2Furcu%2Frcuhlist.h;h=69c4d3184fd50d7f38a730e17447678f5fec3991;hp=ca1da068b1fa6fdbe95db84dae922fc44e66bf84;hb=HEAD;hpb=a0b5ef6802894441aae058f9a34628b565a35846

diff --git a/include/urcu/rcuhlist.h b/include/urcu/rcuhlist.h
index ca1da06..6dab12a 100644
--- a/include/urcu/rcuhlist.h
+++ b/include/urcu/rcuhlist.h
@@ -1,25 +1,12 @@
+// SPDX-FileCopyrightText: 2002 Free Software Foundation, Inc.
+// SPDX-FileCopyrightText: 2009 Pierre-Marc Fournier
+// SPDX-FileCopyrightText: 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+//
+// SPDX-License-Identifier: LGPL-2.1-or-later
+
 /*
- * Copyright (C) 2002 Free Software Foundation, Inc.
  * (originally part of the GNU C Library)
  * Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
- *
- * Copyright (C) 2009 Pierre-Marc Fournier
- * Conversion to RCU list.
- * Copyright (C) 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifndef _URCU_RCUHLIST_H
@@ -55,8 +42,8 @@ void cds_hlist_del_rcu(struct cds_hlist_node *elem)
  * This must be done while rcu_read_lock() is held.
  */
 #define cds_hlist_for_each_rcu(pos, head) \
-	for (pos = rcu_dereference((head)->next); pos != NULL; \
-		pos = rcu_dereference(pos->next))
+	for (pos = rcu_dereference((head)->next); (pos) != NULL; \
+		pos = rcu_dereference((pos)->next))
 
 /*
  * cds_hlist_for_each_entry_rcu takes 4 arguments, while the Linux
@@ -66,16 +53,16 @@ void cds_hlist_del_rcu(struct cds_hlist_node *elem)
  */
 #define cds_hlist_for_each_entry_rcu(entry, pos, head, member) \
 	for (pos = rcu_dereference((head)->next), \
-			entry = cds_hlist_entry(pos, __typeof__(*entry), member); \
-		pos != NULL; \
-		pos = rcu_dereference(pos->next), \
-			entry = cds_hlist_entry(pos, __typeof__(*entry), member))
+			entry = cds_hlist_entry(pos, __typeof__(*(entry)), member); \
+		(pos) != NULL; \
+		pos = rcu_dereference((pos)->next), \
+			entry = cds_hlist_entry(pos, __typeof__(*(entry)), member))
 
 #define cds_hlist_for_each_entry_rcu_2(entry, head, member) \
 	for (entry = cds_hlist_entry_safe(rcu_dereference((head)->next), \
-			__typeof__(*entry), member); \
-		entry != NULL; \
-		entry = cds_hlist_entry_safe(rcu_dereference(entry->member.next), \
-			__typeof__(*entry), member))
+			__typeof__(*(entry)), member); \
+		(entry) != NULL; \
+		entry = cds_hlist_entry_safe(rcu_dereference((entry)->member.next), \
+			__typeof__(*(entry)), member))
 
 #endif	/* _URCU_RCUHLIST_H */