Formatting changes.

[libradsec.git] / list.c

diff --git a/list.c b/list.c
index 99d4e13..971daaf 100644 (file)
--- a/list.c
+++ b/list.c
@@ -1,3 +1,7 @@
+/* Copyright (c) 2006-2010, UNINETT AS
+ * Copyright (c) 2010-2012, NORDUnet A/S */
+/* See LICENSE for licensing information. */
+
 #include <stdlib.h>
 #include <string.h>
 #include "list.h"
@@ -16,7 +20,7 @@ void list_destroy(struct list *list) {
 
     if (!list)
        return;
-    
+
     for (node = list->first; node; node = next) {
        free(node->data);
        next = node->next;
@@ -32,7 +36,7 @@ int list_push(struct list *list, void *data) {
     node = malloc(sizeof(struct list_node));
     if (!node)
        return 0;
-    
+
     node->next = NULL;
     node->data = data;
 
@@ -41,7 +45,8 @@ int list_push(struct list *list, void *data) {
     else
        list->first = node;
     list->last = node;
-    
+
+    list->count++;
     return 1;
 }
 
@@ -49,24 +54,24 @@ int list_push(struct list *list, void *data) {
 void *list_shift(struct list *list) {
     struct list_node *node;
     void *data;
-    
-    if (!list->first)
+
+    if (!list || !list->first)
        return NULL;
-    
+
     node = list->first;
     list->first = node->next;
     if (!list->first)
        list->last = NULL;
     data = node->data;
     free(node);
-    
+    list->count--;
     return data;
 }
 
 /* removes all entries with matching data pointer */
 void list_removedata(struct list *list, void *data) {
     struct list_node *node, *t;
-    
+
     if (!list || !list->first)
        return;
 
@@ -74,6 +79,7 @@ void list_removedata(struct list *list, void *data) {
     while (node->data == data) {
        list->first = node->next;
        free(node);
+       list->count--;
        node = list->first;
        if (!node) {
            list->last = NULL;
@@ -85,6 +91,7 @@ void list_removedata(struct list *list, void *data) {
            t = node->next;
            node->next = t->next;
            free(t);
+           list->count--;
            if (!node->next) { /* we removed the last one */
                list->last = node;
                return;
@@ -101,3 +108,12 @@ 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;
+}
+
+/* Local Variables: */
+/* c-file-style: "stroustrup" */
+/* End: */