list: Assert that we're not inserting already-attached nodes

diff --git a/src/list.h b/src/list.h
index 5587543801164d06d92fe30e76750c626e07cea4..61c22e31106dcf75c05c3d793ab8c5e086117c17 100644 (file)
--- a/src/list.h
+++ b/src/list.h
@@ -82,6 +82,7 @@
 #ifndef BFS_LIST_H
 #define BFS_LIST_H
 
+#include "diag.h"
 #include <stddef.h>
 #include <string.h>
 
@@ -205,6 +206,27 @@
 #define SLIST_EMPTY_(list) \
        (SLIST_CHECK_(list), !list->head)
 
+/**
+ * Check if an item is attached to a singly-linked list.
+ *
+ * @param list
+ *         The list to check.
+ * @param item
+ *         The item to check.
+ * @param node (optional)
+ *         If specified, use item->node.next rather than item->next.
+ * @return
+ *         Whether the item is attached to the list.
+ */
+#define SLIST_ATTACHED(list, ...) \
+       SLIST_ATTACHED_(list, __VA_ARGS__, )
+
+#define SLIST_ATTACHED_(list, item, ...) \
+       SLIST_ATTACHED__((list), (item), LIST_NEXT_(__VA_ARGS__))
+
+#define SLIST_ATTACHED__(list, item, next) \
+       (item->next || list->tail == &item->next)
+
 /**
  * Insert an item into a singly-linked list.
  *
@@ -224,6 +246,7 @@
        SLIST_INSERT__((list), (cursor), (item), LIST_NEXT_(__VA_ARGS__))
 
 #define SLIST_INSERT__(list, cursor, item, next) LIST_VOID_( \
+       bfs_assert(!SLIST_ATTACHED__(list, item, next)), \
        item->next = *cursor, \
        *cursor = item, \
        list->tail = item->next ? list->tail : &item->next)
@@ -425,6 +448,27 @@ static inline void *slist_remove_impl(void *ret, void *cursor, void *next, void
 #define LIST_PREPEND(list, ...) \
        LIST_INSERT(list, NULL, __VA_ARGS__)
 
+/**
+ * Check if an item is attached to a doubly-linked list.
+ *
+ * @param list
+ *         The list to check.
+ * @param item
+ *         The item to check.
+ * @param node (optional)
+ *         If specified, use item->node.{prev,next} rather than item->{prev,next}.
+ * @return
+ *         Whether the item is attached to the list.
+ */
+#define LIST_ATTACHED(list, ...) \
+       LIST_ATTACHED_(list, __VA_ARGS__, )
+
+#define LIST_ATTACHED_(list, item, ...) \
+       LIST_ATTACHED__((list), (item), LIST_PREV_(__VA_ARGS__), LIST_NEXT_(__VA_ARGS__))
+
+#define LIST_ATTACHED__(list, item, prev, next) \
+       (item->prev || item->next || list->head == item || list->tail == item)
+
 /**
  * Insert into a doubly-linked list after the given cursor.
  *
@@ -444,6 +488,7 @@ static inline void *slist_remove_impl(void *ret, void *cursor, void *next, void
        LIST_INSERT__((list), (cursor), (item), LIST_PREV_(__VA_ARGS__), LIST_NEXT_(__VA_ARGS__))
 
 #define LIST_INSERT__(list, cursor, item, prev, next) LIST_VOID_( \
+       bfs_assert(!LIST_ATTACHED__(list, item, prev, next)), \
        item->prev = cursor, \
        item->next = cursor ? cursor->next : list->head, \
        *(item->prev ? &item->prev->next : &list->head) = item, \
@@ -470,27 +515,6 @@ static inline void *slist_remove_impl(void *ret, void *cursor, void *next, void
        *(item->next ? &item->next->prev : &list->tail) = item->prev, \
        item->prev = item->next = NULL)
 
-/**
- * Check if an item is attached to a doubly-linked list.
- *
- * @param list
- *         The list to check.
- * @param item
- *         The item to check.
- * @param node (optional)
- *         If specified, use item->node.{prev,next} rather than item->{prev,next}.
- * @return
- *         Whether the item is attached to the list.
- */
-#define LIST_ATTACHED(list, ...) \
-       LIST_ATTACHED_(list, __VA_ARGS__, )
-
-#define LIST_ATTACHED_(list, item, ...) \
-       LIST_ATTACHED__((list), (item), LIST_PREV_(__VA_ARGS__), LIST_NEXT_(__VA_ARGS__))
-
-#define LIST_ATTACHED__(list, item, prev, next) \
-       (item->prev || item->next || list->head == item || list->tail == item)
-
 /**
  * Loop over the items in a doubly-linked list.
  *

diff --git a/src/trie.c b/src/trie.c
index 55544e659c5b5ea7d06a2abeb4cde42e176f1aec..23b70ff586ed7aa74221d76abd96a3b478ee2d86 100644 (file)
--- a/src/trie.c
+++ b/src/trie.c
@@ -325,6 +325,7 @@ static struct trie_leaf *trie_leaf_alloc(struct trie *trie, const void *key, siz
                return NULL;
        }
 
+       LIST_ITEM_INIT(leaf);
        LIST_APPEND(trie, leaf);
 
        leaf->value = NULL;