Backport from trunk:

[libradsec.git] / list.c

diff --git a/list.c b/list.c
index 2b8f34a..ad0f8d0 100644 (file)
--- a/list.c
+++ b/list.c
@@ -1,3 +1,11 @@
+/*
+ * Copyright (C) 2006-2009 Stig Venaas <venaas@uninett.no>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ */
+
 #include <stdlib.h>
 #include <string.h>
 #include "list.h"
@@ -41,7 +49,8 @@ int list_push(struct list *list, void *data) {
     else
        list->first = node;
     list->last = node;
-    
+
+    list->count++;
     return 1;
 }
 
@@ -50,7 +59,7 @@ void *list_shift(struct list *list) {
     struct list_node *node;
     void *data;
     
-    if (!list->first)
+    if (!list || !list->first)
        return NULL;
     
     node = list->first;
@@ -59,33 +68,38 @@ void *list_shift(struct list *list) {
        list->last = NULL;
     data = node->data;
     free(node);
-    
+    list->count--;
     return data;
 }
 
-/* removes first entry with matching data pointer */
+/* removes all entries with matching data pointer */
 void list_removedata(struct list *list, void *data) {
     struct list_node *node, *t;
     
-    if (!list->first)
+    if (!list || !list->first)
        return;
 
     node = list->first;
-    if (node->data == data) {
+    while (node->data == data) {
        list->first = node->next;
-       if (!list->first)
-           list->last = NULL;
        free(node);
-       return;
+       list->count--;
+       node = list->first;
+       if (!node) {
+           list->last = NULL;
+           return;
+       }
     }
     for (; node->next; node = node->next)
        if (node->next->data == data) {
            t = node->next;
-           node->next = node->next->next;
-           if (!node->next) /* we removed the last one */
-               list->last = node;
+           node->next = t->next;
            free(t);
-           return;
+           list->count--;
+           if (!node->next) { /* we removed the last one */
+               list->last = node;
+               return;
+           }
        }
 }
 
@@ -98,3 +112,8 @@ struct list_node *list_first(struct list *list) {
 struct list_node *list_next(struct list_node *node) {
     return node->next;
 }
+
+/* returns number of nodes */
+uint32_t list_count(struct list *list) {
+    return list->count;
+}