list: New SLIST_SPLICE() macro

2 files changed, 21 insertions, 5 deletions

diff --git a/src/list.h b/src/list.h
index 61d0e5b..d95483f 100644
--- a/src/list.h
+++ b/src/list.h
@@ -324,6 +324,25 @@
 	LIST_VOID_(SLIST_INSERT_(list, &(list)->head, item, __VA_ARGS__))
 
 /**
+ * Splice a singly-linked list into another.
+ *
+ * @param dest
+ *         The destination list.
+ * @param cursor
+ *         A pointer to the item to splice after, e.g. &list->head or list->tail.
+ * @param src
+ *         The source list.
+ */
+#define SLIST_SPLICE(dest, cursor, src) \
+	LIST_VOID_(SLIST_SPLICE_((dest), (cursor), (src)))
+
+#define SLIST_SPLICE_(dest, cursor, src) \
+	*src->tail = *cursor, \
+	*cursor = src->head, \
+	dest->tail = *dest->tail ? src->tail : dest->tail, \
+	SLIST_INIT(src)
+
+/**
  * Add an entire singly-linked list to the tail of another.
  *
  * @param dest
@@ -332,10 +351,7 @@
  *         The source list.
  */
 #define SLIST_EXTEND(dest, src) \
-	SLIST_EXTEND_((dest), (src))
-
-#define SLIST_EXTEND_(dest, src) \
-	(src->head ? (*dest->tail = src->head, dest->tail = src->tail, SLIST_INIT(src)) : (void)0)
+	SLIST_SPLICE(dest, (dest)->tail, src)
 
 /**
  * Remove an item from a singly-linked list.
diff --git a/src/prelude.h b/src/prelude.h
index c4edcb2..0944df1 100644
--- a/src/prelude.h
+++ b/src/prelude.h
@@ -137,7 +137,7 @@ extern const char bfs_version[];
 /**
  * Get the length of an array.
  */
-#define countof(array) (sizeof(array) / sizeof(0[array]))
+#define countof(...) (sizeof(__VA_ARGS__) / sizeof(0[__VA_ARGS__]))
 
 /**
  * False sharing/destructive interference/largest cache line size.