X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/0f4971d043c38bae1bfb95201622a1405110f899..e1385087ec060568a966a5305a9d88c24a2a0a55:/ll.c

diff --git a/ll.c b/ll.c
index debf52b..018ea0d 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)
 {
@@ -30,13 +28,40 @@ struct ll *lladd(struct ll *curll, void *object)
 	return new;
 }
 
+struct ll *lladdend(struct ll *curll, void *object)
+{
+	struct ll *new;
+	struct ll *cur;
+
+	if ((new = malloc(sizeof(struct ll))) == NULL) {
+		logthing(LOGTHING_ERROR,
+				"Couldn't allocate memory in lladdend()");
+		return NULL;
+	}
+
+	new->next = NULL;
+	new->object = object;
+
+	if (curll != NULL) {
+		cur = curll;
+		while (cur->next != NULL) {
+			cur = cur->next;
+		}
+		cur->next = new;
+	} else {
+		curll = new;
+	}
+	
+	return curll;
+}
+
 struct ll *lldel(struct ll *curll, void *object,
 	int (*objectcmp) (const void *object1, const void *object2))
 {
 	struct ll *cur = NULL;
 	struct ll *old = NULL;
 
-	assert(objectcmp != NULL);
+	log_assert(objectcmp != NULL);
 
 	cur = curll;
 	if (cur == NULL) {
@@ -63,7 +88,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 +118,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 +131,5 @@ struct ll *llfree(struct ll *curll,
 		free(curll);
 		curll = nextll;
 	}
-	return NULL;
+	return;
 }