Clean up "set but not used" GCC warnings

[onak.git] / ll.c

diff --git a/ll.c b/ll.c
index 4d1ea4a71f63d054b217bb791be00bdc3f3efc95..ed6315a4e2048b1a5d0b8ec56f79a96218e380b6 100644 (file)
--- a/ll.c
+++ b/ll.c
@@ -1,16 +1,27 @@
 /*
  * ll.c - various things of used for dealing with linked lists.
  *
 /*
  * 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, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

  */
 
  */
 

-#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)
 {


@@ -28,13 +39,40 @@ struct ll *lladd(struct ll *curll, void *object)
        return new;
 }
 
        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;
 
 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) {
 
        cur = curll;
        if (cur == NULL) {


@@ -61,7 +99,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)) {