hlist, rcuhlist: cleanup coding style

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/urcu/hlist.h b/urcu/hlist.h
index d7d5c87f1c28d1c3710ed1d1bb4a08f0751b3a55..1c9083bf955046b726c494024b7713da6e5be8bb 100644 (file)
--- a/urcu/hlist.h
+++ b/urcu/hlist.h
@@ -9,7 +9,7 @@
  *
  * Author: Jan Blunck <jblunck@suse.de>
  *
- * Copyright (C) 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2010-2013 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License version 2.1 as
@@ -18,60 +18,58 @@
 
 #include <stddef.h>
 
-struct cds_hlist_head
-{
+struct cds_hlist_head {
        struct cds_hlist_node *next;
 };
 
-struct cds_hlist_node
-{
-       struct cds_hlist_node *next;
-       struct cds_hlist_node *prev;
+struct cds_hlist_node {
+       struct cds_hlist_node *next, *prev;
 };
 
-/* Initialize a new list head.  */
-static inline void  CDS_INIT_HLIST_HEAD(struct cds_hlist_head *ptr)
+/* Initialize a new list head. */
+static inline
+void CDS_INIT_HLIST_HEAD(struct cds_hlist_head *ptr)
 {
        ptr->next = NULL;
 }
 
-/* Get typed element from list at a given position.  */
-#define cds_hlist_entry(ptr, type, member)                                     \
+/* Get typed element from list at a given position. */
+#define cds_hlist_entry(ptr, type, member) \
        ((type *) ((char *) (ptr) - (unsigned long) (&((type *) 0)->member)))
 
-/* Add new element at the head of the list.  */
-static inline void cds_hlist_add_head (struct cds_hlist_node *newp,
-                                  struct cds_hlist_head *head)
+/* Add new element at the head of the list. */
+static inline
+void cds_hlist_add_head(struct cds_hlist_node *newp,
+               struct cds_hlist_head *head)
 {
        if (head->next)
                head->next->prev = newp;
-
        newp->next = head->next;
-       newp->prev = (struct cds_hlist_node *)head;
+       newp->prev = (struct cds_hlist_node *) head;
        head->next = newp;
 }
 
-/* Remove element from list.  */
-static inline void cds_hlist_del (struct cds_hlist_node *elem)
+/* Remove element from list. */
+static inline
+void cds_hlist_del(struct cds_hlist_node *elem)
 {
        if (elem->next)
                elem->next->prev = elem->prev;
-
        elem->prev->next = elem->next;
 }
 
-#define cds_hlist_for_each_entry(entry, pos, head, member)                     \
-       for (pos = (head)->next,                                        \
-                    entry = cds_hlist_entry(pos, __typeof__(*entry), member);  \
-            pos != NULL;                                               \
-            pos = pos->next,                                   \
-                    entry = cds_hlist_entry(pos, __typeof__(*entry), member))
+#define cds_hlist_for_each_entry(entry, pos, head, member) \
+       for (pos = (head)->next, \
+                       entry = cds_hlist_entry(pos, __typeof__(*entry), member); \
+               pos != NULL; \
+               pos = pos->next, \
+                       entry = cds_hlist_entry(pos, __typeof__(*entry), member))
 
-#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 = p,                                                   \
-                    entry = cds_hlist_entry(pos, __typeof__(*entry), member))
+#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 = p, \
+                       entry = cds_hlist_entry(pos, __typeof__(*entry), member))
 
 #endif /* _KCOMPAT_HLIST_H */

diff --git a/urcu/rcuhlist.h b/urcu/rcuhlist.h
index 8549550e7fab3358fd031b30ed87ff67244f1472..36da15bc31d95394420a6958c05a5435927b1c2b 100644 (file)
--- a/urcu/rcuhlist.h
+++ b/urcu/rcuhlist.h
@@ -29,10 +29,10 @@
 #include <urcu/arch.h>
 #include <urcu-pointer.h>
 
-/* Add new element at the head of the list.
- */
-static inline void cds_hlist_add_head_rcu(struct cds_hlist_node *newp,
-                                     struct cds_hlist_head *head)
+/* Add new element at the head of the list. */
+static inline
+void cds_hlist_add_head_rcu(struct cds_hlist_node *newp,
+               struct cds_hlist_head *head)
 {
        newp->next = head->next;
        newp->prev = (struct cds_hlist_node *)head;
@@ -43,23 +43,23 @@ static inline void cds_hlist_add_head_rcu(struct cds_hlist_node *newp,
 }
 
 /* Remove element from list. */
-static inline void cds_hlist_del_rcu(struct cds_hlist_node *elem)
+static inline
+void cds_hlist_del_rcu(struct cds_hlist_node *elem)
 {
        if (elem->next)
                elem->next->prev = elem->prev;
        elem->prev->next = elem->next;
 }
 
-
-/* Iterate through elements of the list.
+/*
+ * Iterate through elements of the list.
  * This must be done while rcu_read_lock() is held.
  */
-
-#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))
+#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))
 
 #endif /* _URCU_RCUHLIST_H */