From 2fd63ec80abd12a25ba652ff338c237c33668e33 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Fri, 5 Feb 2016 12:03:33 +0100 Subject: [PATCH] dlist: remove unneeded type argument from DLIST_CONCATENATE() Signed-off-by: Michael Adam Reviewed-by: Jeremy Allison --- lib/util/dlinklist.h | 3 +-- lib/util/tests/dlinklist.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/util/dlinklist.h b/lib/util/dlinklist.h index f3528a3cfef..0d95ae43fb7 100644 --- 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 f743607f0f1..50adab3b79e 100644 --- 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"); -- 2.47.3