diff options
| -rw-r--r-- | libbb/llist.c | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/libbb/llist.c b/libbb/llist.c index 8a74832..63c77fa 100644 --- a/libbb/llist.c +++ b/libbb/llist.c @@ -14,37 +14,44 @@ #include "libbb.h" /* Add data to the start of the linked list. */ -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)); + new_head->data = data; new_head->link = *old_head; *old_head = new_head; } /* Add data to the end of the linked list. */ -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)); + new_item->data = data; new_item->link = NULL; - if (!*list_head) *list_head = new_item; + if (!*list_head) + *list_head = new_item; else { llist_t *tail = *list_head; - while (tail->link) tail = tail->link; + + while (tail->link) + tail = tail->link; tail->link = new_item; } } /* Remove first element from the list and return it */ -void *llist_pop(llist_t **head) +void *llist_pop(llist_t ** head) { void *data; - if(!*head) data = *head; + if (!*head) + data = *head; else { void *next = (*head)->link; + data = (*head)->data; free(*head); *head = next; @@ -55,21 +62,25 @@ void *llist_pop(llist_t **head) /* Recursively free all elements in the linked list. If freeit != NULL * call it on each datum in the list */ -void llist_free(llist_t *elm, void (*freeit)(void *data)) +void llist_free(llist_t * elm, void (*freeit) (void *data)) { while (elm) { void *data = llist_pop(&elm); - if (freeit) freeit(data); + + if (freeit) + freeit(data); } } /* Reverse list order. Useful since getopt32 saves option params * in reverse order */ -llist_t* rev_llist(llist_t *list) +llist_t *rev_llist(llist_t * list) { llist_t *new = NULL; + while (list) { llist_t *next = list->link; + list->link = new; new = list; list = next; |