Patchwork [3/4] petitboot: Add list insert routines

login
register
mail settings
Submitter Geoff Levand
Date Feb. 8, 2009, 4:35 a.m.
Message ID <20090208043550.908398902@am.sony.com>
Download mbox | patch
Permalink /patch/22563/
State Accepted
Delegated to: Jeremy Kerr
Headers show

Comments

Geoff Levand - Feb. 8, 2009, 4:35 a.m.
Add new list insertion routines list_insert_before(), list_insert_after(),
and list_add_tail().  Also, change list_add() to use list_insert_after().

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
---
 lib/list/list.c |   18 ++++++++++++------
 lib/list/list.h |   14 +++++++++++---
 2 files changed, 23 insertions(+), 9 deletions(-)

Patch

--- a/lib/list/list.c
+++ b/lib/list/list.c
@@ -7,13 +7,20 @@  void list_init(struct list *list)
 	list->head.prev = &list->head;
 }
 
-void list_add(struct list *list, struct list_item *new)
+void list_insert_before(struct list_item *next, struct list_item *new)
 {
-	new->next = list->head.next;
-	new->prev = &list->head;
+	new->next = next;
+	new->prev = next->prev;
+	next->prev->next = new;
+	next->prev = new;
+}
 
-	list->head.next->prev = new;
-	list->head.next = new;
+void list_insert_after(struct list_item *prev, struct list_item *new)
+{
+	new->next = prev->next;
+	new->prev = prev;
+	prev->next->prev = new;
+	prev->next = new;
 }
 
 void list_remove(struct list_item *item)
@@ -21,4 +28,3 @@  void list_remove(struct list_item *item)
 	item->next->prev = item->prev;
 	item->prev->next = item->next;
 }
-
--- a/lib/list/list.h
+++ b/lib/list/list.h
@@ -31,9 +31,17 @@  struct list {
 	     pos = list_entry(pos->member.next, typeof(*pos), member))
 
 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 *new);
+void list_insert_after(struct list_item *prev, struct list_item *new);
 void list_remove(struct list_item *item);
 
+static inline void list_add(struct list *list, struct list_item *new)
+{
+	list_insert_after(&list->head, new);
+}
+static inline void list_add_tail(struct list *list, struct list_item *new)
+{
+	list_insert_before(&list->head, new);
+}
+
 #endif /* _LIST_H */