X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=ll.c;h=3545a9c48232221a7ea9ffedfa7b69f3dd98de83;hb=a57a146ebc3f15f1ba2dfe8ecb9b59702fb8f799;hp=debf52b278759d9702f6cad1b729a6931f8bac08;hpb=0f4971d043c38bae1bfb95201622a1405110f899;p=onak.git

diff --git a/ll.c b/ll.c
index debf52b..3545a9c 100644
--- a/ll.c
+++ b/ll.c
@@ -4,15 +4,13 @@
  * 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>
 #include <stdio.h>
 #include <stdlib.h>
 
 #include "ll.h"
+#include "log.h"
 
 struct ll *lladd(struct ll *curll, void *object)
 {
@@ -36,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) {
@@ -63,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)) {
@@ -93,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;
 
@@ -107,5 +104,5 @@ struct ll *llfree(struct ll *curll,
 		free(curll);
 		curll = nextll;
 	}
-	return NULL;
+	return;
 }