This commit is contained in:
Bernhard Reutner-Fischer 2007-02-04 20:32:38 +00:00
parent 7154b99c89
commit d909d23451

View File

@ -17,6 +17,7 @@
void llist_add_to(llist_t ** old_head, void *data) void llist_add_to(llist_t ** old_head, void *data)
{ {
llist_t *new_head = xmalloc(sizeof(llist_t)); llist_t *new_head = xmalloc(sizeof(llist_t));
new_head->data = data; new_head->data = data;
new_head->link = *old_head; new_head->link = *old_head;
*old_head = new_head; *old_head = new_head;
@ -26,13 +27,17 @@ void llist_add_to(llist_t **old_head, void *data)
void llist_add_to_end(llist_t ** list_head, void *data) void llist_add_to_end(llist_t ** list_head, void *data)
{ {
llist_t *new_item = xmalloc(sizeof(llist_t)); llist_t *new_item = xmalloc(sizeof(llist_t));
new_item->data = data; new_item->data = data;
new_item->link = NULL; new_item->link = NULL;
if (!*list_head) *list_head = new_item; if (!*list_head)
*list_head = new_item;
else { else {
llist_t *tail = *list_head; llist_t *tail = *list_head;
while (tail->link) tail = tail->link;
while (tail->link)
tail = tail->link;
tail->link = new_item; tail->link = new_item;
} }
} }
@ -42,9 +47,11 @@ void *llist_pop(llist_t **head)
{ {
void *data; void *data;
if(!*head) data = *head; if (!*head)
data = *head;
else { else {
void *next = (*head)->link; void *next = (*head)->link;
data = (*head)->data; data = (*head)->data;
free(*head); free(*head);
*head = next; *head = next;
@ -59,7 +66,9 @@ void llist_free(llist_t *elm, void (*freeit)(void *data))
{ {
while (elm) { while (elm) {
void *data = llist_pop(&elm); void *data = llist_pop(&elm);
if (freeit) freeit(data);
if (freeit)
freeit(data);
} }
} }
@ -68,8 +77,10 @@ void llist_free(llist_t *elm, void (*freeit)(void *data))
llist_t *rev_llist(llist_t * list) llist_t *rev_llist(llist_t * list)
{ {
llist_t *new = NULL; llist_t *new = NULL;
while (list) { while (list) {
llist_t *next = list->link; llist_t *next = list->link;
list->link = new; list->link = new;
new = list; new = list;
list = next; list = next;