Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/libbb/llist.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/libbb/llist.c (modified) (1 diff)

branches/2.2.5/mindi-busybox/libbb/llist.c

@@ -8 +8 @@
  * 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.  */
 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;
 }
-#endif
 
-#ifdef L_llist_add_to_end
 /* Add data to the end of the linked list.  */
 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;
     }
 }
-#endif
 
-#ifdef L_llist_pop
 /* Remove first element from the list and return it */
 void *llist_pop(llist_t **head)
 {
-    void *data;
+    void *data, *next;
 
-    if(!*head) data = *head;
-    else {
-        void *next = (*head)->link;
-        data = (*head)->data;
-        free(*head);
-        *head = next;
-    }
+    if (!*head)
+        return NULL;
+
+    data = (*head)->data;
+    next = (*head)->link;
+    free(*head);
+    *head = next;
 
     return data;
 }
-#endif
 
-#ifdef L_llist_free
+/* Unlink arbitrary given element from the list */
+void llist_unlink(llist_t **head, llist_t *elm)
+{
+    llist_t *crt;
+
+    if (!(elm && *head))
+        return;
+
+    if (elm == *head) {
+        *head = (*head)->link;
+        return;
+    }
+
+    for (crt = *head; crt; crt = crt->link) {
+        if (crt->link == elm) {
+            crt->link = elm->link;
+            return;
+        }
+    }
+}
+
 /* 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);
     }
 }
+
+#ifdef UNUSED
+/* Reverse list order. */
+llist_t *llist_rev(llist_t *list)
+{
+    llist_t *rev = NULL;
+
+    while (list) {
+        llist_t *next = list->link;
+
+        list->link = rev;
+        rev = list;
+        list = next;
+    }
+    return rev;
+}
 #endif