diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2017-05-15 17:51:19 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2017-05-26 13:56:44 +0200 |
| commit | 8a2e4d4a8b87f5e8a5e5f663ee8eddd47988fa2c (patch) | |
| tree | e2054396e993ee839052b87ee6fa27a6a0177a32 /src/libstrongswan/tests/suites | |
| parent | 5cafea6edd74432f0a3c38b2a0b94f1256ebf4cf (diff) | |
| download | strongswan-8a2e4d4a8b87f5e8a5e5f663ee8eddd47988fa2c.tar.bz2 strongswan-8a2e4d4a8b87f5e8a5e5f663ee8eddd47988fa2c.tar.xz | |
linked-list: Change interface of callback for invoke_function()
This avoids the unportable five pointer hack.
Diffstat (limited to 'src/libstrongswan/tests/suites')
| -rw-r--r-- | src/libstrongswan/tests/suites/test_linked_list.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/libstrongswan/tests/suites/test_linked_list.c b/src/libstrongswan/tests/suites/test_linked_list.c index ec29d70ee..209e311d2 100644 --- a/src/libstrongswan/tests/suites/test_linked_list.c +++ b/src/libstrongswan/tests/suites/test_linked_list.c @@ -244,8 +244,13 @@ struct invoke_t { void (*invoke)(invoke_t *item); }; -static void invoke(intptr_t item, void *a, void *b, void *c, void *d, int *sum) +CALLBACK(invoke, void, + intptr_t item, va_list args) { + void *a, *b, *c, *d; + int *sum; + + VA_ARGS_VGET(args, a, b, c, d, sum); ck_assert_int_eq((uintptr_t)a, 1); ck_assert_int_eq((uintptr_t)b, 2); ck_assert_int_eq((uintptr_t)c, 3); @@ -267,8 +272,7 @@ START_TEST(test_invoke_function) list->insert_last(list, (void*)3); list->insert_last(list, (void*)4); list->insert_last(list, (void*)5); - list->invoke_function(list, (linked_list_invoke_t)invoke, - (uintptr_t)1, (uintptr_t)2, + list->invoke_function(list, invoke, (uintptr_t)1, (uintptr_t)2, (uintptr_t)3, (uintptr_t)4, &sum); ck_assert_int_eq(sum, 15); } |