Cleanup various includes

[onak.git] / ll.c

diff --git a/ll.c b/ll.c
index ed6315a4e2048b1a5d0b8ec56f79a96218e380b6..70603b40cfd233bd4022d8a742bef500f0fc2580 100644 (file)
--- a/ll.c
+++ b/ll.c
@@ -17,11 +17,11 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 #include "ll.h"
-#include "log.h"
 
 struct ll *lladd(struct ll *curll, void *object)
 {
@@ -45,8 +45,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;
        }
 
@@ -72,7 +70,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) {
@@ -99,7 +97,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)) {
@@ -120,15 +118,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;