cscvs to tla changeset 8

[onak.git] / ll.c

diff --git a/ll.c b/ll.c
index acad0bcae8c64980bac57aa812e9399ae798d6d8..71103786483d2bfc1fb7eeaf8879b9b894f06ea1 100644 (file)
--- a/ll.c
+++ b/ll.c
@@ -31,7 +31,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 *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);
 
 
        assert(objectcmp != NULL);
 


@@ -39,11 +40,16 @@ struct ll *lldel(struct ll *curll, void *object,
        if (cur == NULL) {
                return NULL;
        } else if (!(*objectcmp)(cur->object, 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)) {
        } 
        while (cur->next != NULL) {
                if (!(*objectcmp)(cur->next->object, object)) {

+                       old = cur->next;

                        cur->next = cur->next->next;
                        cur->next = cur->next->next;

+                       free(old);

                        break;
                }
        }
                        break;
                }
        }


@@ -55,6 +61,8 @@ struct ll *llfind(struct ll *curll, void *object,
 {
        struct ll *cur;
 
 {
        struct ll *cur;
 

+       assert(objectcmp != NULL);
+

        cur = curll;
        while (cur != NULL && (*objectcmp)(cur->object, object)) {
                cur = cur->next;
        cur = curll;
        while (cur != NULL && (*objectcmp)(cur->object, object)) {
                cur = cur->next;