denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linked-list: Change return value of find_first() and signature of its callback

Browse Source 
This avoids the unportable five pointer hack.
This commit is contained in:
Tobias Brunner
2017-05-26 13:56:44 +02:00
parent 8a2e4d4a8b
commit 2e4d110d1e
29 changed files with 526 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/tests/suites/test_linked_list.c
+66 -15
View File
@@ -183,26 +183,48 @@ END_TEST
* find
*/
static bool match_a_b(void *item, void *a, void *b)
CALLBACK(find_a_b, bool,
void *item, va_list args)
{
void *a, *b;
VA_ARGS_VGET(args, a, b);
ck_assert(a == (void*)1);
ck_assert(b == (void*)2);
return item == a || item == b;
}
CALLBACK(find_a, bool,
void *item, va_list args)
{
void *a;
VA_ARGS_VGET(args, a);
return match_a(item, a);
}
CALLBACK(find_b, bool,
void *item, va_list args)
{
void *b;
VA_ARGS_VGET(args, b);
return match_b(item, b);
}
START_TEST(test_find)
{
void *a = (void*)1, *b = (void*)2;
ck_assert(list->find_first(list, NULL, &a) == NOT_FOUND);
ck_assert(!list->find_first(list, NULL, &a));
list->insert_last(list, a);
ck_assert(list->find_first(list, NULL, &a) == SUCCESS);
ck_assert(list->find_first(list, NULL, &b) == NOT_FOUND);
ck_assert(list->find_first(list, NULL, &a));
ck_assert(!list->find_first(list, NULL, &b));
list->insert_last(list, b);
ck_assert(list->find_first(list, NULL, &a) == SUCCESS);
ck_assert(list->find_first(list, NULL, &b) == SUCCESS);
ck_assert(list->find_first(list, NULL, &a));
ck_assert(list->find_first(list, NULL, &b));
ck_assert(list->find_first(list, NULL, NULL) == NOT_FOUND);
ck_assert(!list->find_first(list, NULL, NULL));
}
END_TEST
@@ -210,29 +232,57 @@ START_TEST(test_find_callback)
{
void *a = (void*)1, *b = (void*)2, *x = NULL;
ck_assert(list->find_first(list, (linked_list_match_t)match_a_b, &x, a, b) == NOT_FOUND);
ck_assert(!list->find_first(list, find_a_b, &x, a, b));
list->insert_last(list, a);
ck_assert(list->find_first(list, (linked_list_match_t)match_a, NULL, a) == SUCCESS);
ck_assert(list->find_first(list, find_a, NULL, a));
x = NULL;
ck_assert(list->find_first(list, (linked_list_match_t)match_a, &x, a) == SUCCESS);
ck_assert(list->find_first(list, find_a, &x, a));
ck_assert(a == x);
ck_assert(list->find_first(list, (linked_list_match_t)match_b, &x, b) == NOT_FOUND);
ck_assert(!list->find_first(list, find_b, &x, b));
ck_assert(a == x);
x = NULL;
ck_assert(list->find_first(list, (linked_list_match_t)match_a_b, &x, a, b) == SUCCESS);
ck_assert(list->find_first(list, find_a_b, &x, a, b));
ck_assert(a == x);
list->insert_last(list, b);
ck_assert(list->find_first(list, (linked_list_match_t)match_a, &x, a) == SUCCESS);
ck_assert(list->find_first(list, find_a, &x, a));
ck_assert(a == x);
ck_assert(list->find_first(list, (linked_list_match_t)match_b, &x, b) == SUCCESS);
ck_assert(list->find_first(list, find_b, &x, b));
ck_assert(b == x);
x = NULL;
ck_assert(list->find_first(list, (linked_list_match_t)match_a_b, &x, a, b) == SUCCESS);
ck_assert(list->find_first(list, find_a_b, &x, a, b));
ck_assert(a == x);
}
END_TEST
CALLBACK(find_args, bool,
void *item, va_list args)
{
uint64_t d, e;
level_t c;
int *a, b;
VA_ARGS_VGET(args, a, b, c, d, e);
ck_assert_int_eq(*a, 1);
ck_assert_int_eq(b, 2);
ck_assert_int_eq(c, LEVEL_PRIVATE);
ck_assert_int_eq(d, UINT64_MAX);
ck_assert_int_eq(e, UINT64_MAX-1);
return item == a;
}
START_TEST(test_find_callback_args)
{
int a = 1, b = 2, *x;
uint64_t d = UINT64_MAX;
list->insert_last(list, &a);
ck_assert(list->find_first(list, find_args, (void**)&x, &a, b,
LEVEL_PRIVATE, d, UINT64_MAX-1));
ck_assert_int_eq(a, *x);
}
END_TEST
/*******************************************************************************
* invoke
*/
@@ -464,6 +514,7 @@ Suite *linked_list_suite_create()
tcase_add_checked_fixture(tc, setup_list, teardown_list);
tcase_add_test(tc, test_find);
tcase_add_test(tc, test_find_callback);
tcase_add_test(tc, test_find_callback_args);
suite_add_tcase(s, tc);
tc = tcase_create("invoke");