Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix swap

This commit is contained in:
Julien Danjou 2008-01-16 20:51:18 +01:00
parent 4ee9cdcd67
commit 8cc730cb5a
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
list.h
View File

@ -76,19 +76,6 @@
dtor(&item); \ dtor(&item); \
} \ } \
} \ } \
static inline void prefix##_list_swap(type **list, type *item1, \
type *item2) \
{ \
type *i1n = item1->next; \
type *i2n = item2->next; \
item1->next = i2n == item1 ? item2 : i2n; \
item2->next = i1n == item2 ? item1 : i1n; \
\
if(*list == item1) \
*list = item2; \
else if(*list == item2) \
*list = item1; \
} \
static inline type *prefix##_list_prev(type **list, type *item) \ static inline type *prefix##_list_prev(type **list, type *item) \
{ \ { \
type *tmp; \ type *tmp; \
@ -96,6 +83,29 @@
for(tmp = *list; tmp && tmp->next != item; tmp = tmp->next); \ for(tmp = *list; tmp && tmp->next != item; tmp = tmp->next); \
return tmp; \ return tmp; \
} \ } \
static inline void prefix##_list_swap(type **list, type *item1, \
type *item2) \
{ \
type *i1p, *i2p; \
if(!item1 || !item2) return; \
type *i1n = item1->next; \
type *i2n = item2->next; \
item1->next = i2n == item1 ? item2 : i2n; \
item2->next = i1n == item2 ? item1 : i1n; \
\
i1p = prefix##_list_prev(list, item1); \
i2p = prefix##_list_prev(list, item2); \
\
if(i1p && i1p != item2) \
i1p->next = item2; \
if(i2p && i2p != item1) \
i2p->next = item1; \
\
if(*list == item1) \
*list = item2; \
else if(*list == item2) \
*list = item1; \
} \
static inline type *prefix##_list_prev_cycle(type **list, type *item) \ static inline type *prefix##_list_prev_cycle(type **list, type *item) \
{ \ { \
type *tmp = prefix##_list_prev(list, item); \ type *tmp = prefix##_list_prev(list, item); \