From b6e3f2b55742279bfb7deeb3b79cf56eb82740bb Mon Sep 17 00:00:00 2001 From: mquinson Date: Thu, 8 Nov 2007 14:27:36 +0000 Subject: [PATCH] Ops, missed some signess fixups git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5005 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/config_unit.c | 2 +- src/xbt/config.c | 2 +- src/xbt/cunit.c | 8 ++++---- src/xbt/set.c | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/config_unit.c b/src/config_unit.c index 67e4f2f21d..f1931ea43a 100644 --- a/src/config_unit.c +++ b/src/config_unit.c @@ -96,7 +96,7 @@ XBT_TEST_UNIT("use",test_config_use,"Data retrieving tests") { dyn = xbt_cfg_get_dynar(myset,"user"); if (xbt_dynar_length(dyn) != 3) - xbt_test_fail1("Dynar length = %d, I expected 3", (int)xbt_dynar_length(dyn)); + xbt_test_fail1("Dynar length = %lu, I expected 3", xbt_dynar_length(dyn)); if (strcmp(xbt_dynar_get_as(dyn,0,char*),"foo")) xbt_test_fail1("Dynar[0] = %s, I expected foo", xbt_dynar_get_as(dyn,0,char*)); diff --git a/src/xbt/config.c b/src/xbt/config.c index 793d9a1e0b..1eb50712fb 100644 --- a/src/xbt/config.c +++ b/src/xbt/config.c @@ -1229,7 +1229,7 @@ XBT_TEST_UNIT("use",test_config_use,"Data retrieving tests") { dyn = xbt_cfg_get_dynar(myset,"user"); if (xbt_dynar_length(dyn) != 3) - xbt_test_fail1("Dynar length = %d, I expected 3", (int)xbt_dynar_length(dyn)); + xbt_test_fail1("Dynar length = %lu, I expected 3", xbt_dynar_length(dyn)); if (strcmp(xbt_dynar_get_as(dyn,0,char*),"foo")) xbt_test_fail1("Dynar[0] = %s, I expected foo", xbt_dynar_get_as(dyn,0,char*)); diff --git a/src/xbt/cunit.c b/src/xbt/cunit.c index 010eec38f9..717b4e1a3b 100644 --- a/src/xbt/cunit.c +++ b/src/xbt/cunit.c @@ -492,8 +492,8 @@ static void apply_selection(char *selection) { suite->enabled = enabling; } } else { - int it; - for (it=0; it< (int)xbt_dynar_length(_xbt_test_suites); it++) { + unsigned int it; + for (it=0; it< xbt_dynar_length(_xbt_test_suites); it++) { xbt_test_suite_t thissuite=xbt_dynar_get_as(_xbt_test_suites,it,xbt_test_suite_t); if (!strcmp(suitename,thissuite->name)) { /* Do not disable the whole suite when we just want to disable a child */ @@ -505,9 +505,9 @@ static void apply_selection(char *selection) { unit->enabled = enabling; } } else { /* act on one child only */ - int it2_unit; + unsigned int it2_unit; /* search it, first (we won't reuse it for external loop which gets broken) */ - for (it2_unit=0; it2_unit< (int)xbt_dynar_length(thissuite->units); it2_unit++) { + for (it2_unit=0; it2_unit< xbt_dynar_length(thissuite->units); it2_unit++) { xbt_test_unit_t thisunit=xbt_dynar_get_as(thissuite->units,it2_unit,xbt_test_unit_t); if (!strcmp(thisunit->name,unitname)) { thisunit->enabled = enabling; diff --git a/src/xbt/set.c b/src/xbt/set.c index 609ecd6318..25c8364723 100644 --- a/src/xbt/set.c +++ b/src/xbt/set.c @@ -230,7 +230,7 @@ unsigned long xbt_set_length (const xbt_set_t set) { ***/ typedef struct xbt_set_cursor_ { xbt_set_t set; - int val; + unsigned int val; } s_xbt_set_cursor_t; /** @brief Create the cursor if it does not exists, rewind it in any case. */ @@ -265,7 +265,7 @@ void xbt_set_cursor_step (xbt_set_cursor_t cursor) { do { cursor->val++; } - while (cursor->val < (int)xbt_dynar_length(dynar) && + while (cursor->val < xbt_dynar_length(dynar) && xbt_dynar_get_ptr(dynar, cursor->val) == NULL); } @@ -282,7 +282,7 @@ int xbt_set_cursor_get_or_free (xbt_set_cursor_t *curs, cursor=*curs; - if (cursor->val >= (int)xbt_dynar_length(cursor->set->dynar)) { + if (cursor->val >= xbt_dynar_length(cursor->set->dynar)) { free(cursor); *curs=NULL; return FALSE; -- 2.20.1