X-Git-Url: https://the.earth.li/gitweb/?p=onak.git;a=blobdiff_plain;f=ll.c;h=e9cde23e9a0f1d71868e57e8fa9085b59595848a;hp=3545a9c48232221a7ea9ffedfa7b69f3dd98de83;hb=6d60149434eed130c201d4d670ce7b3be5c2866b;hpb=8b4052ad6015aa9f54c9c824f28655f230d09d8d diff --git a/ll.c b/ll.c index 3545a9c..e9cde23 100644 --- a/ll.c +++ b/ll.c @@ -1,16 +1,26 @@ /* * ll.c - various things of used for dealing with linked lists. * - * Jonathan McDowell + * Copyright 2000-2004 Jonathan McDowell * - * 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 . */ +#include #include #include #include "ll.h" -#include "log.h" struct ll *lladd(struct ll *curll, void *object) { @@ -28,13 +38,38 @@ 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) { + 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; - log_assert(objectcmp != NULL); + assert(objectcmp != NULL); cur = curll; if (cur == NULL) { @@ -61,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)) { @@ -82,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;