Add STATIC_LIST initializer

[petitboot] / lib / list / list.h

diff --git a/lib/list/list.h b/lib/list/list.h
index f78411ea18f7679e058dfaa1f4f6ebb987cc582c..c8c56318a340b834e99d70fcca96e2cce544db22 100644 (file)
--- a/lib/list/list.h
+++ b/lib/list/list.h
@@ -30,17 +30,29 @@ struct list {
             &pos->member != &(list)->head;     \
             pos = list_entry(pos->member.next, typeof(*pos), member))
 
-#define list_for_each_entry_safe(list, pos, n, member)                 \
-       for (pos = list_entry((list)->head.next, typeof(*pos), member), \
-               n = list_entry(pos->member.next, typeof(*pos), member); \
-            &pos->member != &(list)->head;                             \
-            pos = n, n = list_entry(n->member.next, typeof(*n), 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_add(struct list *list, struct list_item *item);
-
+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);
 
+static inline void list_add(struct list *list, struct list_item *item)
+{
+       list_insert_after(&list->head, item);
+}
+static inline void list_add_tail(struct list *list, struct list_item *item)
+{
+       list_insert_before(&list->head, item);
+}
+
 #endif /* _LIST_H */