Use proper type for enumerator_t/linked_list_t tests

Worked with -O2 but not with -O0.

diff --git a/src/libstrongswan/tests/test_enumerator.c b/src/libstrongswan/tests/test_enumerator.c
index 882e8cc61d0baf03b9fd422b092c818891055dbb..f49ae338007c94c4ab0e548cda847a0d5304bcb3 100644 (file)
--- a/src/libstrongswan/tests/test_enumerator.c
+++ b/src/libstrongswan/tests/test_enumerator.c
@@ -142,7 +142,8 @@ static enumerator_t* create_inner(linked_list_t *outer, void *data)
 
 START_TEST(test_nested)
 {
-       int round, x;
+       intptr_t x;
+       int round;
        linked_list_t *list, *l1, *l2, *l3;
        enumerator_t *enumerator;
 

diff --git a/src/libstrongswan/tests/test_linked_list_enumerator.c b/src/libstrongswan/tests/test_linked_list_enumerator.c
index ed098c07c47b48bd511a8441898092013b39414c..fd55eaad12639a91263b9fd9e0c1354ddc1f92fc 100644 (file)
--- a/src/libstrongswan/tests/test_linked_list_enumerator.c
+++ b/src/libstrongswan/tests/test_linked_list_enumerator.c
@@ -42,7 +42,8 @@ static void teardown_list()
 START_TEST(test_enumerate)
 {
        enumerator_t *enumerator;
-       int round, x;
+       intptr_t x;
+       int round;
 
        round = 1;
        enumerator = list->create_enumerator(list);
@@ -59,7 +60,8 @@ END_TEST
 START_TEST(test_reset_enumerator)
 {
        enumerator_t *enumerator;
-       int round, x;
+       intptr_t x;
+       int round;
 
        enumerator = list->create_enumerator(list);
        while (enumerator->enumerate(enumerator, &x))
@@ -80,7 +82,8 @@ END_TEST
 START_TEST(test_has_more)
 {
        enumerator_t *enumerator;
-       int round, x;
+       intptr_t x;
+       int round;
 
        round = 1;
        enumerator = list->create_enumerator(list);
@@ -112,7 +115,8 @@ END_TEST
 START_TEST(test_insert_before)
 {
        enumerator_t *enumerator;
-       int round, x;
+       intptr_t x;
+       int round;
 
        round = 1;
        enumerator = list->create_enumerator(list);
@@ -147,7 +151,8 @@ END_TEST
 START_TEST(test_insert_before_ends)
 {
        enumerator_t *enumerator;
-       int round, x;
+       intptr_t x;
+       int round;
 
        enumerator = list->create_enumerator(list);
        list->insert_before(list, enumerator, (void*)0);
@@ -173,7 +178,7 @@ END_TEST
 START_TEST(test_insert_before_empty)
 {
        enumerator_t *enumerator;
-       int x;
+       intptr_t x;
 
        list->destroy(list);
        list = linked_list_create();
@@ -199,7 +204,8 @@ END_TEST
 START_TEST(test_replace)
 {
        enumerator_t *enumerator;
-       int round, x;
+       intptr_t x;
+       int round;
 
        round = 1;
        enumerator = list->create_enumerator(list);
@@ -223,7 +229,8 @@ END_TEST
 START_TEST(test_remove_at)
 {
        enumerator_t *enumerator;
-       int round, x;
+       intptr_t x;
+       int round;
 
        round = 1;
        enumerator = list->create_enumerator(list);
@@ -255,7 +262,7 @@ END_TEST
 START_TEST(test_remove_at_ends)
 {
        enumerator_t *enumerator;
-       int x;
+       intptr_t x;
 
        enumerator = list->create_enumerator(list);
        list->remove_at(list, enumerator);