X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/8e58a1769ce5e492dd68904dfc81b6e077fc2a3a..e02c731dfbb288c736f2cd09a9b6df0507c59ddd:/ll.c diff --git a/ll.c b/ll.c index acad0bc..7110378 100644 --- 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 *cur; + struct ll *cur = NULL; + struct ll *old = 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)) { - 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 +61,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;