wget: fix error message.

[oweals/busybox.git] / libbb / llist.c

diff --git a/libbb/llist.c b/libbb/llist.c
index ce7daddeebae8c74815a8f910dc966d5a893a00a..8a74832ee3ff54e50d08c4e86f0c1daefbf0965e 100644 (file)
--- a/libbb/llist.c
+++ b/libbb/llist.c
@@ -5,67 +5,74 @@
  * Copyright (C) 2003 Glenn McGrath
  * Copyright (C) 2005 Vladimir Oleynik
  * Copyright (C) 2005 Bernhard Fischer
+ * Copyright (C) 2006 Rob Landley <rob@landley.net>
  *
- * Licensed under the GPL v2, see the file LICENSE in this tarball.
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
+
 #include <stdlib.h>
 #include "libbb.h"
 
-#ifdef L_llist_add_to
 /* Add data to the start of the linked list.  */
-extern llist_t *llist_add_to(llist_t *old_head, char *new_item)
+void llist_add_to(llist_t **old_head, void *data)
 {
-       llist_t *new_head;
-
-       new_head = xmalloc(sizeof(llist_t));
-       new_head->data = new_item;
-       new_head->link = old_head;
-
-       return (new_head);
+       llist_t *new_head = xmalloc(sizeof(llist_t));
+       new_head->data = data;
+       new_head->link = *old_head;
+       *old_head = new_head;
 }
-#endif
 
-#ifdef L_llist_add_to_end
 /* Add data to the end of the linked list.  */
-extern llist_t *llist_add_to_end(llist_t *list_head, char *data)
+void llist_add_to_end(llist_t **list_head, void *data)
 {
-       llist_t *new_item;
-
-       new_item = xmalloc(sizeof(llist_t));
+       llist_t *new_item = xmalloc(sizeof(llist_t));
        new_item->data = data;
        new_item->link = NULL;
 
-       if (list_head == NULL) {
-               list_head = new_item;
-       } else {
-               llist_t *tail = list_head;
-               while (tail->link)
-                       tail = tail->link;
+       if (!*list_head) *list_head = new_item;
+       else {
+               llist_t *tail = *list_head;
+               while (tail->link) tail = tail->link;
                tail->link = new_item;
        }
-       return list_head;
 }
-#endif
 
-#ifdef L_llist_free_one
-/* Free the current list element and advance to the next entry in the list.
- * Returns a pointer to the next element.  */
-extern llist_t *llist_free_one(llist_t *elm)
+/* Remove first element from the list and return it */
+void *llist_pop(llist_t **head)
+{
+       void *data;
+
+       if(!*head) data = *head;
+       else {
+               void *next = (*head)->link;
+               data = (*head)->data;
+               free(*head);
+               *head = next;
+       }
+
+       return data;
+}
+
+/* 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))
 {
-       llist_t *next = elm ? elm->link : NULL;
-#if ENABLE_DMALLOC /* avoid warnings from dmalloc's error-free-null option */
-       if (elm)
-#endif
-               free(elm);
-       elm = next;
-       return elm;
+       while (elm) {
+               void *data = llist_pop(&elm);
+               if (freeit) freeit(data);
+       }
 }
-#endif
 
-#ifdef L_llist_free
-/* Recursively free all elements in the linked list.  */
-extern void llist_free(llist_t *elm)
+/* Reverse list order. Useful since getopt32 saves option params
+ * in reverse order */
+llist_t* rev_llist(llist_t *list)
 {
-       while ((elm = llist_free_one(elm)));
+       llist_t *new = NULL;
+       while (list) {
+               llist_t *next = list->link;
+               list->link = new;
+               new = list;
+               list = next;
+       }
+       return new;
 }
-#endif