1.1 --- a/test/test_list.c Sat Dec 04 17:38:23 2021 +0100
1.2 +++ b/test/test_list.c Mon Dec 20 11:17:06 2021 +0100
1.3 @@ -288,7 +288,6 @@
1.4
1.5 void *begin;
1.6 void *end;
1.7 - void *result;
1.8
1.9 // single linked list
1.10 struct node third = {NULL};
1.11 @@ -296,23 +295,17 @@
1.12 struct node first = {&second};
1.13 begin = &first;
1.14
1.15 - result = cx_linked_list_remove(&begin, NULL, -1, loc, &second);
1.16 - CU_ASSERT_PTR_EQUAL(result, &first)
1.17 + cx_linked_list_remove(&begin, NULL, -1, loc, &second);
1.18 CU_ASSERT_PTR_EQUAL(begin, &first)
1.19 CU_ASSERT_PTR_EQUAL(first.next, &third)
1.20 - CU_ASSERT_PTR_NULL(second.next)
1.21 CU_ASSERT_PTR_NULL(third.next)
1.22
1.23 - result = cx_linked_list_remove(&begin, NULL, -1, loc, &first);
1.24 - CU_ASSERT_PTR_EQUAL(result, &third)
1.25 + cx_linked_list_remove(&begin, NULL, -1, loc, &first);
1.26 CU_ASSERT_PTR_EQUAL(begin, &third)
1.27 - CU_ASSERT_PTR_NULL(first.next)
1.28 CU_ASSERT_PTR_NULL(third.next)
1.29
1.30 - result = cx_linked_list_remove(&begin, NULL, -1, loc, &third);
1.31 - CU_ASSERT_PTR_NULL(result)
1.32 + cx_linked_list_remove(&begin, NULL, -1, loc, &third);
1.33 CU_ASSERT_PTR_NULL(begin)
1.34 - CU_ASSERT_PTR_NULL(third.next)
1.35
1.36 // doubly linked list
1.37 struct dnode dthird = {NULL , NULL};
1.38 @@ -323,32 +316,23 @@
1.39 begin = &dfirst;
1.40 end = &dthird;
1.41
1.42 - result = cx_linked_list_remove(&begin, &end, ploc, loc, &dsecond);
1.43 - CU_ASSERT_PTR_EQUAL(result, &dfirst)
1.44 + cx_linked_list_remove(&begin, &end, ploc, loc, &dsecond);
1.45 CU_ASSERT_PTR_EQUAL(begin, &dfirst)
1.46 CU_ASSERT_PTR_EQUAL(end, &dthird)
1.47 CU_ASSERT_PTR_NULL(dfirst.prev)
1.48 CU_ASSERT_PTR_EQUAL(dfirst.next, &dthird)
1.49 - CU_ASSERT_PTR_NULL(dsecond.prev)
1.50 - CU_ASSERT_PTR_NULL(dsecond.next)
1.51 CU_ASSERT_PTR_EQUAL(dthird.prev, &dfirst)
1.52 CU_ASSERT_PTR_NULL(dthird.next)
1.53
1.54 - result = cx_linked_list_remove(&begin, &end, ploc, loc, &dthird);
1.55 - CU_ASSERT_PTR_EQUAL(result, &dfirst)
1.56 + cx_linked_list_remove(&begin, &end, ploc, loc, &dthird);
1.57 CU_ASSERT_PTR_EQUAL(begin, &dfirst)
1.58 CU_ASSERT_PTR_EQUAL(end, &dfirst)
1.59 CU_ASSERT_PTR_NULL(dfirst.prev)
1.60 CU_ASSERT_PTR_NULL(dfirst.next)
1.61 - CU_ASSERT_PTR_NULL(dthird.prev)
1.62 - CU_ASSERT_PTR_NULL(dthird.next)
1.63
1.64 - result = cx_linked_list_remove(&begin, &end, ploc, loc, &dfirst);
1.65 - CU_ASSERT_PTR_NULL(result)
1.66 + cx_linked_list_remove(&begin, &end, ploc, loc, &dfirst);
1.67 CU_ASSERT_PTR_NULL(begin)
1.68 CU_ASSERT_PTR_NULL(end)
1.69 - CU_ASSERT_PTR_NULL(dfirst.next)
1.70 - CU_ASSERT_PTR_NULL(dfirst.prev)
1.71 }
1.72
1.73 void test_linked_list_size(void) {
