discover/grub2: Allow URL resources

[petitboot] / lib / list / list.h

diff --git a/lib/list/list.h b/lib/list/list.h
index c8c56318a340b834e99d70fcca96e2cce544db22..0174b90e21b281edf4adba6c8bd7ef3d36b2f3e0 100644 (file)
--- a/lib/list/list.h
+++ b/lib/list/list.h
@@ -10,37 +10,53 @@ struct list {
 };
 
 #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
-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+#define offsetof(_type, _member) ((size_t) &((_type *)0)->_member)
 #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, _list) \
+       (&container_of(_ptr, _type, _member)->_member == &((_list)->head) \
+       ? NULL \
+       : 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_prev_entry(_list, _pos, _member) \
+       list_entry(_pos->_member.prev, typeof(*_pos), _member, _list)
+
+#define list_next_entry(_list, _pos, _member) \
+       list_entry(_pos->_member.next, typeof(*_pos), _member, _list)
+
+#define list_for_each_entry(_list, _pos, _member) \
+       for (_pos = list_entry((_list)->head.next, typeof(*_pos), _member, _list); \
+               _pos; _pos = list_next_entry(_list, _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))
+       for (; _pos; _pos = list_next_entry(_list, _pos, _member))
 
-#define STATIC_LIST(_list) static struct list _list = { \
+#define list_for_each_entry_safe(_list, _pos, _tmp, _member) \
+       for (_pos = container_of((_list)->head.next, typeof(*_pos), _member), \
+               _tmp = container_of(_pos->_member.next, typeof(*_pos), \
+                               _member); \
+            &_pos->_member != &(_list)->head; \
+            _pos = _tmp, \
+            _tmp = container_of(_tmp->_member.next, typeof(*_pos), _member))
+
+#define DEFINE_LIST(_list) struct list _list = { \
        .head = { \
                .next = &_list.head, \
                .prev = &_list.head \
        } \
 }
 
+#define STATIC_LIST(_list) static DEFINE_LIST(_list)
+
 void list_init(struct list *list);
 void list_insert_before(struct list_item *next, struct list_item *item);
 void list_insert_after(struct list_item *prev, struct list_item *item);