X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Flist%2Flist.h;h=ad562e4cc9bedece8d299893329d084f1abddefd;hp=dfe4813e52f6f9fe331227eff2eb998fbf52f6ee;hb=052961eb2e8279f103c091e850c317da335c0207;hpb=62cf2ababe1046b88bf225db3d2ec7187c634812

diff --git a/lib/list/list.h b/lib/list/list.h
index dfe4813..ad562e4 100644
--- a/lib/list/list.h
+++ b/lib/list/list.h
@@ -1,6 +1,8 @@
 #ifndef _LIST_H
 #define _LIST_H
 
+#include <util/util.h>
+
 struct list_item {
 	struct list_item *prev, *next;
 };
@@ -9,38 +11,44 @@ struct list {
 	struct list_item head;
 };
 
-#ifndef container_of
-#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)
-#endif
-
 #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_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); \
-	     &_pos->_member != &(_list)->head; \
-	     _pos = list_entry(_pos->_member.next, typeof(*_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 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 STATIC_LIST(_list) static struct list _list = { \
+#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);