aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2013-03-27 11:24:14 +0100
committerTobias Brunner <tobias@strongswan.org>2013-06-11 11:03:11 +0200
commit952073b8a71f950365eee3a486c3827d1ae42e9e (patch)
tree43a6bed3265d3136beea4995ac032f2a3455a0bd /src
parentde42bf35f9c9f6312a28f8befd8b2a1eaa6d9bfc (diff)
downloadstrongswan-952073b8a71f950365eee3a486c3827d1ae42e9e.tar.bz2
strongswan-952073b8a71f950365eee3a486c3827d1ae42e9e.tar.xz
Use proper type for enumerator_t/linked_list_t tests
Worked with -O2 but not with -O0.
Diffstat (limited to 'src')
-rw-r--r--src/libstrongswan/tests/test_enumerator.c3
-rw-r--r--src/libstrongswan/tests/test_linked_list_enumerator.c25
2 files changed, 18 insertions, 10 deletions
diff --git a/src/libstrongswan/tests/test_enumerator.c b/src/libstrongswan/tests/test_enumerator.c
index 882e8cc61..f49ae3380 100644
--- 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 ed098c07c..fd55eaad1 100644
--- 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);