From 608c1899dbff7471a870491295d38809e2d650ac Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Sun, 15 Jun 2003 20:45:00 +0000 Subject: [PATCH] Replaced clist_insert() by clist_insert_{before,after}(). Added clist_empty() and CLIST_WALK_DELSAFE. --- lib/clists.h | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/lib/clists.h b/lib/clists.h index e9826eb6..aed8028a 100644 --- a/lib/clists.h +++ b/lib/clists.h @@ -38,25 +38,40 @@ static inline void *clist_prev(clist *l, cnode *n) return (n->prev != &l->head) ? (void *) n->prev : NULL; } +static inline int clist_empty(clist *l) +{ + return (l->head.next == &l->head); +} + #define CLIST_WALK(n,list) for(n=(void*)(list).head.next; (cnode*)(n) != &(list).head; n=(void*)((cnode*)(n))->next) +#define CLIST_WALK_DELSAFE(n,list,tmp) for(n=(void*)(list).head.next; tmp=(void*)((cnode*)(n))->next, (cnode*)(n) != &(list).head; n=(void*)tmp) -static inline void clist_insert(cnode *what, cnode *after) +static inline void clist_insert_after(cnode *what, cnode *after) { cnode *before = after->next; what->next = before; - what->prev = before->prev; + what->prev = after; + before->prev = what; + after->next = what; +} + +static inline void clist_insert_before(cnode *what, cnode *before) +{ + cnode *after = before->prev; + what->next = before; + what->prev = after; before->prev = what; after->next = what; } static inline void clist_add_tail(clist *l, cnode *n) { - clist_insert(n, l->head.prev); + clist_insert_before(n, &l->head); } static inline void clist_add_head(clist *l, cnode *n) { - clist_insert(n, &l->head); + clist_insert_after(n, &l->head); } static inline void clist_remove(cnode *n) -- 2.39.2