Fix handling of other signature requirement

[onak.git] / ll.c

diff --git a/ll.c b/ll.c
index 018ea0d72ccdc19fee6877357d3741282e6fa01e..e9cde23e9a0f1d71868e57e8fa9085b59595848a 100644 (file)
--- a/ll.c
+++ b/ll.c
@@ -1,16 +1,26 @@
 /*
  * ll.c - various things of used for dealing with linked lists.
  *
- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2000-2004 Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2000-2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 #include "ll.h"
-#include "log.h"
 
 struct ll *lladd(struct ll *curll, void *object)
 {
@@ -34,8 +44,6 @@ struct ll *lladdend(struct ll *curll, void *object)
        struct ll *cur;
 
        if ((new = malloc(sizeof(struct ll))) == NULL) {
-               logthing(LOGTHING_ERROR,
-                               "Couldn't allocate memory in lladdend()");
                return NULL;
        }
 
@@ -61,7 +69,7 @@ struct ll *lldel(struct ll *curll, void *object,
        struct ll *cur = NULL;
        struct ll *old = NULL;
 
-       log_assert(objectcmp != NULL);
+       assert(objectcmp != NULL);
 
        cur = curll;
        if (cur == NULL) {
@@ -88,7 +96,7 @@ struct ll *llfind(struct ll *curll, void *object,
 {
        struct ll *cur;
 
-       log_assert(objectcmp != NULL);
+       assert(objectcmp != NULL);
 
        cur = curll;
        while (cur != NULL && (*objectcmp)(cur->object, object)) {
@@ -109,15 +117,6 @@ 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;