Cleanup list formatting

[petitboot] / lib / list / list.h

diff --git a/lib/list/list.h b/lib/list/list.h
index fe2c1d39358e8614cbc7cd8deed23df6e7d50a8d..dfe4813e52f6f9fe331227eff2eb998fbf52f6ee 100644 (file)
--- a/lib/list/list.h
+++ b/lib/list/list.h
@@ -10,38 +10,49 @@ struct list {
 };
 
 #ifndef container_of
 };
 
 #ifndef container_of

-#define container_of(ptr, type, member) ({                     \
-       const typeof( ((type *)0)->member ) *__mptr = (ptr);    \
-       (type *)( (char *)__mptr - offsetof(type,member) );})
+#define container_of(_ptr, _type, _member) ({ \
+       const typeof( ((_type *)0)->_member ) *__mptr = (_ptr); \
+       (_type *)( (char *)__mptr - offsetof(_type,_member) );})

 #endif
 
 #ifndef offsetof
 #endif
 
 #ifndef offsetof

-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+#define offsetof(_type, _member) ((size_t) &((_type *)0)->_member)

 #endif
 
 #endif
 

-#define list_for_each(list, pos) \
-       for (pos = (list)->head.next; pos != ((list)->head); pos = pos->next)
+#define list_for_each(_list, _pos) \
+       for (_pos = (_list)->head.next; _pos != ((_list)->head); _pos = _pos->next)

 
 

-#define list_entry(ptr, type, member) \
-       container_of(ptr, type, member)
+#define list_entry(_ptr, _type, _member) \
+       container_of(_ptr, _type, _member)

 
 

-#define list_for_each_entry(list, pos, member)                         \
-       for (pos = list_entry((list)->head.next, typeof(*pos), member); \
-            &pos->member != &(list)->head;     \
-            pos = list_entry(pos->member.next, typeof(*pos), member))
+#define list_for_each_entry(_list, _pos, _member) \
+       for (_pos = list_entry((_list)->head.next, typeof(*_pos), _member); \
+            &_pos->_member != &(_list)->head; \
+            _pos = list_entry(_pos->_member.next, typeof(*_pos), _member))
+
+#define list_for_each_entry_continue(_list, _pos, _member) \
+       for (; &_pos->_member != &(_list)->head; \
+               _pos = list_entry(_pos->_member.next, typeof(*_pos), _member))
+
+#define STATIC_LIST(_list) static struct list _list = { \
+       .head = { \
+               .next = &_list.head, \
+               .prev = &_list.head \
+       } \
+}

 
 void list_init(struct list *list);
 
 void list_init(struct list *list);

-void list_insert_before(struct list_item *next, struct list_item *new);
-void list_insert_after(struct list_item *prev, struct list_item *new);
+void list_insert_before(struct list_item *next, struct list_item *item);
+void list_insert_after(struct list_item *prev, struct list_item *item);

 void list_remove(struct list_item *item);
 
 void list_remove(struct list_item *item);
 

-static inline void list_add(struct list *list, struct list_item *new)
+static inline void list_add(struct list *list, struct list_item *item)

 {
 {

-       list_insert_after(&list->head, new);
+       list_insert_after(&list->head, item);

 }
 }

-static inline void list_add_tail(struct list *list, struct list_item *new)
+static inline void list_add_tail(struct list *list, struct list_item *item)

 {
 {

-       list_insert_before(&list->head, new);
+       list_insert_before(&list->head, item);

 }
 
 #endif /* _LIST_H */
 }
 
 #endif /* _LIST_H */