dlist: remove unneeded type argument from DLIST_CONCATENATE()

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/lib/util/dlinklist.h b/lib/util/dlinklist.h
index f3528a3cfef090b0f6108de5e4d20e32557cd978..0d95ae43fb796fa0eebbe8c5691fbdfe3c94fd3f 100644 (file)
--- a/lib/util/dlinklist.h
+++ b/lib/util/dlinklist.h
@@ -160,9 +160,8 @@ do { \
 /*
    concatenate two lists - putting all elements of the 2nd list at the
    end of the first list.
-   Note that 'type' is ignored
 */
-#define DLIST_CONCATENATE(list1, list2, type)  \
+#define DLIST_CONCATENATE(list1, list2) \
 do { \
        if (!(list1)) { \
                (list1) = (list2); \

diff --git a/lib/util/tests/dlinklist.c b/lib/util/tests/dlinklist.c
index f743607f0f1c7c6901a1f7c944ee22ead7e18f08..50adab3b79e68bdf510de2dd7ae092b2c6afdc98 100644 (file)
--- a/lib/util/tests/dlinklist.c
+++ b/lib/util/tests/dlinklist.c
@@ -100,7 +100,7 @@ static bool torture_local_dlinklist_simple(struct torture_context *tctx)
        torture_assert_int_equal(tctx, i, 6, "should have 6 elements");
 
        torture_comment(tctx, "check DLIST_CONCATENATE\n");
-       DLIST_CONCATENATE(l1, l2, NULL);
+       DLIST_CONCATENATE(l1, l2);
        torture_comment(tctx, "count forward\n");
        for (i=0,el=l1; el; el=el->next) i++;
        torture_assert_int_equal(tctx, i, 12, "should have 12 elements");