X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/4b8483ae278577a3adc8d84da81d77019704466f..8e18b511aefa7786b66cb2ff152f1f4492ef4e33:/ll.c?ds=inline

diff --git a/ll.c b/ll.c
index acad0bc..5936bf6 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;
@@ -73,3 +81,29 @@ 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.
+ */
+struct ll *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 NULL;
+}