X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=ll.c;h=3545a9c48232221a7ea9ffedfa7b69f3dd98de83;hb=a57a146ebc3f15f1ba2dfe8ecb9b59702fb8f799;hp=5936bf60d5665f444237561d6b612205a22c7dc0;hpb=e01d2e2d07392eb03e4268fdc4f0f1339a9a9461;p=onak.git diff --git a/ll.c b/ll.c index 5936bf6..3545a9c 100644 --- a/ll.c +++ b/ll.c @@ -6,11 +6,11 @@ * Copyright 2000-2002 Project Purple */ -#include #include #include #include "ll.h" +#include "log.h" struct ll *lladd(struct ll *curll, void *object) { @@ -34,7 +34,7 @@ struct ll *lldel(struct ll *curll, void *object, struct ll *cur = NULL; struct ll *old = NULL; - assert(objectcmp != NULL); + log_assert(objectcmp != NULL); cur = curll; if (cur == NULL) { @@ -61,7 +61,7 @@ struct ll *llfind(struct ll *curll, void *object, { struct ll *cur; - assert(objectcmp != NULL); + log_assert(objectcmp != NULL); cur = curll; while (cur != NULL && (*objectcmp)(cur->object, object)) { @@ -91,8 +91,7 @@ unsigned long llsize(struct ll *curll) * 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)) +void llfree(struct ll *curll, void (*objectfree) (void *object)) { struct ll *nextll; @@ -105,5 +104,5 @@ struct ll *llfree(struct ll *curll, free(curll); curll = nextll; } - return NULL; + return; }