projects
/
onak.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup db4 properly if we fail to open it.
[onak.git]
/
ll.c
diff --git
a/ll.c
b/ll.c
index 5936bf60d5665f444237561d6b612205a22c7dc0..3545a9c48232221a7ea9ffedfa7b69f3dd98de83 100644
(file)
--- a/
ll.c
+++ b/
ll.c
@@
-6,11
+6,11
@@
* Copyright 2000-2002 Project Purple
*/
* Copyright 2000-2002 Project Purple
*/
-#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include "ll.h"
#include <stdio.h>
#include <stdlib.h>
#include "ll.h"
+#include "log.h"
struct ll *lladd(struct ll *curll, void *object)
{
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;
struct ll *cur = NULL;
struct ll *old = NULL;
- assert(objectcmp != NULL);
+
log_
assert(objectcmp != NULL);
cur = curll;
if (cur == NULL) {
cur = curll;
if (cur == NULL) {
@@
-61,7
+61,7
@@
struct ll *llfind(struct ll *curll, void *object,
{
struct ll *cur;
{
struct ll *cur;
- assert(objectcmp != NULL);
+
log_
assert(objectcmp != NULL);
cur = curll;
while (cur != NULL && (*objectcmp)(cur->object, object)) {
cur = curll;
while (cur != NULL && (*objectcmp)(cur->object, object)) {
@@
-91,8
+91,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.
*/
* 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;
{
struct ll *nextll;
@@
-105,5
+104,5
@@
struct ll *llfree(struct ll *curll,
free(curll);
curll = nextll;
}
free(curll);
curll = nextll;
}
- return
NULL
;
+ return;
}
}