Fix: incorrect parenthesis in cds_hlist_for_each_entry_safe_2

[urcu.git] / urcu / hlist.h

diff --git a/urcu/hlist.h b/urcu/hlist.h
index 1c9083bf955046b726c494024b7713da6e5be8bb..344481133eac2051f4d7ab85e6188f51887e7dd7 100644 (file)
--- a/urcu/hlist.h
+++ b/urcu/hlist.h
@@ -33,6 +33,12 @@ void CDS_INIT_HLIST_HEAD(struct cds_hlist_head *ptr)
        ptr->next = NULL;
 }
 
+#define CDS_HLIST_HEAD(name) \
+       struct cds_hlist_head name = { NULL }
+
+#define CDS_HLIST_HEAD_INIT(name) \
+       { .next = NULL }
+
 /* Get typed element from list at a given position. */
 #define cds_hlist_entry(ptr, type, member) \
        ((type *) ((char *) (ptr) - (unsigned long) (&((type *) 0)->member)))
@@ -58,6 +64,20 @@ void cds_hlist_del(struct cds_hlist_node *elem)
        elem->prev->next = elem->next;
 }
 
+#define cds_hlist_for_each(pos, head) \
+       for (pos = (head)->next; pos != NULL; pos = pos->next)
+
+#define cds_hlist_for_each_safe(pos, p, head) \
+       for (pos = (head)->next; \
+               (pos != NULL) && (p = pos->next, 1); \
+               pos = p)
+
+/*
+ * cds_hlist_for_each_entry and cds_hlist_for_each_entry_safe take
+ * respectively 4 and 5 arguments, while the Linux kernel APIs take 3,
+ * and 4. We implement cds_hlist_for_each_entry_2() and
+ * cds_hlist_for_each_entry_safe_2() to follow the Linux kernel APIs.
+ */
 #define cds_hlist_for_each_entry(entry, pos, head, member) \
        for (pos = (head)->next, \
                        entry = cds_hlist_entry(pos, __typeof__(*entry), member); \
@@ -68,8 +88,23 @@ void cds_hlist_del(struct cds_hlist_node *elem)
 #define cds_hlist_for_each_entry_safe(entry, pos, p, head, member) \
        for (pos = (head)->next, \
                        entry = cds_hlist_entry(pos, __typeof__(*entry), member); \
-               (pos != NULL) && ({ p = pos->next; 1;}); \
+               (pos != NULL) && (p = pos->next, 1); \
                pos = p, \
                        entry = cds_hlist_entry(pos, __typeof__(*entry), member))
 
+#define cds_hlist_for_each_entry_2(entry, head, member) \
+       for (entry = ((head)->next == NULL ? NULL \
+                       : cds_hlist_entry((head)->next, __typeof__(*entry), member)); \
+               entry != NULL; \
+               entry = (entry->member.next == NULL ? NULL \
+                       : cds_hlist_entry(entry->member.next, __typeof__(*entry), member)))
+
+#define cds_hlist_for_each_entry_safe_2(entry, e, head, member) \
+       for (entry = ((head)->next == NULL ? NULL \
+                       : cds_hlist_entry((head)->next, __typeof__(*entry), member)); \
+               (entry != NULL) && (e = (entry->member.next == NULL ? NULL \
+                                       : cds_hlist_entry(entry->member.next, \
+                                               __typeof__(*entry), member)), 1); \
+               entry = e)
+
 #endif /* _KCOMPAT_HLIST_H */