F-Ticks logging amendments

[libradsec.git] / list.c

diff --git a/list.c b/list.c
index 578c61a..58ab7aa 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"
@@ -13,7 +21,10 @@ struct list *list_create() {
 /* frees all memory associated with the list */
 void list_destroy(struct list *list) {
     struct list_node *node, *next;
-    
+
+    if (!list)
+       return;
+
     for (node = list->first; node; node = next) {
        free(node->data);
        next = node->next;
@@ -23,13 +34,13 @@ void list_destroy(struct list *list) {
 }
 
 /* appends entry to list; returns 1 if ok, 0 if malloc fails */
-int list_add(struct list *list, void *data) {
+int list_push(struct list *list, void *data) {
     struct list_node *node;
 
     node = malloc(sizeof(struct list_node));
     if (!node)
        return 0;
-    
+
     node->next = NULL;
     node->data = data;
 
@@ -38,16 +49,75 @@ int list_add(struct list *list, void *data) {
     else
        list->first = node;
     list->last = node;
-    
+
+    list->count++;
     return 1;
 }
 
+/* removes first entry from list and returns data */
+void *list_shift(struct list *list) {
+    struct list_node *node;
+    void *data;
+
+    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;
+
+    node = list->first;
+    while (node->data == data) {
+       list->first = node->next;
+       free(node);
+       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 = t->next;
+           free(t);
+           list->count--;
+           if (!node->next) { /* we removed the last one */
+               list->last = node;
+               return;
+           }
+       }
+}
+
 /* returns first node */
 struct list_node *list_first(struct list *list) {
-    return list->first;
+    return list ? list->first : NULL;
 }
 
 /* returns the next node after the argument */
 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: */