X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/e02c731dfbb288c736f2cd09a9b6df0507c59ddd..2ded7b1e4475beb7a3f132deeeae807861bdc399:/ll.c?ds=sidebyside

diff --git a/ll.c b/ll.c
index 7110378..3545a9c 100644
--- a/ll.c
+++ b/ll.c
@@ -6,11 +6,11 @@
  * Copyright 2000-2002 Project Purple
  */
 
-#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 #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)) {
@@ -81,3 +81,28 @@ 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.
+ */
+void 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;
+}