linked-list: invoke_offset() doesn't take any additional arguments anymore

diff --git a/src/libstrongswan/collections/linked_list.c b/src/libstrongswan/collections/linked_list.c
index eb11339bc89c5ebd2c04f8176d70e11a3fbb2e86..8dc6834b1bf8ba74b064049641546874cc0da183 100644 (file)
--- a/src/libstrongswan/collections/linked_list.c
+++ b/src/libstrongswan/collections/linked_list.c
@@ -394,16 +394,15 @@ METHOD(linked_list_t, find_first, status_t,
 }
 
 METHOD(linked_list_t, invoke_offset, void,
-       private_linked_list_t *this, size_t offset,
-       void *d1, void *d2, void *d3, void *d4, void *d5)
+       private_linked_list_t *this, size_t offset)
 {
        element_t *current = this->first;
-       linked_list_invoke_t *method;
+       void (**method)(void*);
 
        while (current)
        {
                method = current->value + offset;
-               (*method)(current->value, d1, d2, d3, d4, d5);
+               (*method)(current->value);
                current = current->next;
        }
 }
@@ -555,7 +554,7 @@ linked_list_t *linked_list_create()
                        .remove_last = _remove_last,
                        .remove = _remove_,
                        .remove_at = (void*)_remove_at,
-                       .invoke_offset = (void*)_invoke_offset,
+                       .invoke_offset = _invoke_offset,
                        .invoke_function = (void*)_invoke_function,
                        .clone_offset = _clone_offset,
                        .equals_offset = _equals_offset,

diff --git a/src/libstrongswan/collections/linked_list.h b/src/libstrongswan/collections/linked_list.h
index 0b73079d39173384af328074f6b9b644897472a4..c123063f798fdfe9ea6f6b6d8685aced14cc5263 100644 (file)
--- a/src/libstrongswan/collections/linked_list.h
+++ b/src/libstrongswan/collections/linked_list.h
@@ -192,12 +192,9 @@ struct linked_list_t {
         * which can be evalutated at compile time using the offsetof
         * macro, e.g.: list->invoke(list, offsetof(object_t, method));
         *
-        * @warning Only use pointers as user supplied data.
-        *
         * @param offset        offset of the method to invoke on objects
-        * @param ...           user data to supply to called function (limited to 5 arguments)
         */
-       void (*invoke_offset) (linked_list_t *this, size_t offset, ...);
+       void (*invoke_offset)(linked_list_t *this, size_t offset);
 
        /**
         * Invoke a function on all of the contained objects.

diff --git a/src/libstrongswan/tests/suites/test_linked_list.c b/src/libstrongswan/tests/suites/test_linked_list.c
index 7a161817c181e8e0b3d91b6098a93caef792558e..ec29d70ee783d2f87a1ae63d66fa161a92b8920b 100644 (file)
--- a/src/libstrongswan/tests/suites/test_linked_list.c
+++ b/src/libstrongswan/tests/suites/test_linked_list.c
@@ -241,7 +241,7 @@ typedef struct invoke_t invoke_t;
 
 struct invoke_t {
        int val;
-       void (*invoke)(invoke_t *item, void *a, void *b, void *c, void *d, int *sum);
+       void (*invoke)(invoke_t *item);
 };
 
 static void invoke(intptr_t item, void *a, void *b, void *c, void *d, int *sum)
@@ -253,9 +253,9 @@ static void invoke(intptr_t item, void *a, void *b, void *c, void *d, int *sum)
        *sum += item;
 }
 
-static void invoke_offset(invoke_t *item, void *a, void *b, void *c, void *d, int *sum)
+static void invoke_offset(invoke_t *item)
 {
-       invoke(item->val, a, b, c, d, sum);
+       item->val++;
 }
 
 START_TEST(test_invoke_function)
@@ -282,17 +282,19 @@ START_TEST(test_invoke_offset)
                { .val = 3, .invoke = invoke_offset, },
                { .val = 4, .invoke = invoke_offset, },
                { .val = 5, .invoke = invoke_offset, },
-       };
-       int i, sum = 0;
+       }, *item;
+       int i;
 
        for (i = 0; i < countof(items); i++)
        {
                list->insert_last(list, &items[i]);
        }
-       list->invoke_offset(list, offsetof(invoke_t, invoke),
-                                               (uintptr_t)1, (uintptr_t)2,
-                                               (uintptr_t)3, (uintptr_t)4, &sum);
-       ck_assert_int_eq(sum, 15);
+       list->invoke_offset(list, offsetof(invoke_t, invoke));
+       i = 2;
+       while (list->remove_first(list, (void**)&item) == SUCCESS)
+       {
+               ck_assert_int_eq(item->val, i++);
+       }
 }
 END_TEST