X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=list.c;h=58ab7aa43565922c6dfe980173ecc0e9ad17292a;hb=b7cd7fa81980ded55692b8cea770fd0a698ed7ec;hp=ae102fc541bfff999ffbaa13632f06ebf8900e1d;hpb=924eb6a12fa17c4ebbff5c8a15bd266358c16b09;p=libradsec.git

diff --git a/list.c b/list.c
index ae102fc..58ab7aa 100644
--- a/list.c
+++ b/list.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2008 Stig Venaas <venaas@uninett.no>
+ * 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
@@ -24,7 +24,7 @@ void list_destroy(struct list *list) {
 
     if (!list)
 	return;
-    
+
     for (node = list->first; node; node = next) {
 	free(node->data);
 	next = node->next;
@@ -40,7 +40,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;
 
@@ -49,7 +49,8 @@ int list_push(struct list *list, void *data) {
     else
 	list->first = node;
     list->last = node;
-    
+
+    list->count++;
     return 1;
 }
 
@@ -57,24 +58,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;
 
@@ -82,6 +83,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;
@@ -93,6 +95,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;
@@ -109,3 +112,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: */