cscvs to tla changeset 99

[onak.git] / ll.c

diff --git a/ll.c b/ll.c
index acad0bcae8c64980bac57aa812e9399ae798d6d8..debf52b278759d9702f6cad1b729a6931f8bac08 100644 (file)
--- a/ll.c
+++ b/ll.c
@@ -4,6 +4,8 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2000-2002 Project Purple
+ *
+ * $Id: ll.c,v 1.4 2003/06/04 20:57:10 noodles Exp $
  */
 
 #include <assert.h>
@@ -31,7 +33,8 @@ struct ll *lladd(struct ll *curll, void *object)
 struct ll *lldel(struct ll *curll, void *object,
        int (*objectcmp) (const void *object1, const void *object2))
 {
-       struct ll *cur;
+       struct ll *cur = NULL;
+       struct ll *old = NULL;
 
        assert(objectcmp != NULL);
 
@@ -39,11 +42,16 @@ struct ll *lldel(struct ll *curll, void *object,
        if (cur == NULL) {
                return NULL;
        } else if (!(*objectcmp)(cur->object, object)) {
-               return cur->next;
+               old = cur;
+               cur = cur->next;
+               free(old);
+               return cur;
        } 
        while (cur->next != NULL) {
                if (!(*objectcmp)(cur->next->object, object)) {
+                       old = cur->next;
                        cur->next = cur->next->next;
+                       free(old);
                        break;
                }
        }
@@ -55,6 +63,8 @@ struct ll *llfind(struct ll *curll, void *object,
 {
        struct ll *cur;
 
+       assert(objectcmp != NULL);
+
        cur = curll;
        while (cur != NULL && (*objectcmp)(cur->object, object)) {
                cur = cur->next;
@@ -73,3 +83,29 @@ unsigned long llsize(struct ll *curll)
 
        return count;
 }
+
+/**
+ *     llfree - Frees a linked list.
+ *     @curll: The list to free.
+ *     @objectfree: A pointer to a free function for the object.
+ *
+ *     Walks through a list and free it. If a function is provided for
+ *     objectfree then it's called for each element to free them, if it's NULL
+ *     just the list is freed.
+ */
+struct ll *llfree(struct ll *curll,
+       void (*objectfree) (void *object))
+{
+       struct ll *nextll;
+
+       while (curll != NULL) {
+               nextll = curll->next;
+               if (curll->object != NULL && objectfree != NULL) {
+                       objectfree(curll->object);
+                       curll->object = NULL;
+               }
+               free(curll);
+               curll = nextll;
+       }
+       return NULL;
+}