From ef4f048178e3b6cec78b1ca6be62e732e30ac87d Mon Sep 17 00:00:00 2001 From: mquinson Date: Wed, 23 Feb 2005 08:08:59 +0000 Subject: [PATCH] Bugfix: don't assume that null content means not found. Add tons of debugs to find where this issue came from and reindent git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@1042 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/xbt/dict_cursor.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/xbt/dict_cursor.c b/src/xbt/dict_cursor.c index 4861777509..1e3393556b 100644 --- a/src/xbt/dict_cursor.c +++ b/src/xbt/dict_cursor.c @@ -94,9 +94,9 @@ _cursor_push_keys(xbt_dict_cursor_t cursor, int i = 0; static volatile int count = 0; /* ??? */ - CDEBUG1(dict_cursor, "Push childs of %p in the cursor", (void*)elm); + CDEBUG3(dict_cursor, "Push childs of %p (%.*s) in the cursor", (void*)elm, elm->key_len, elm->key); - if (elm->content) { + if (!elm->internal) { xbt_dynar_push(cursor->keys, &elm->key ); xbt_dynar_push(cursor->key_lens, &elm->key_len); count++; @@ -155,6 +155,9 @@ void xbt_dict_cursor_step(xbt_dict_cursor_t cursor) { xbt_assert(cursor); + DEBUG2("step cursor. Current=%.*s", + xbt_dynar_get_as(cursor->key_lens,cursor->pos_len,int), + xbt_dynar_get_as(cursor->keys,cursor->pos,char *)); xbt_dynar_cursor_step(cursor->keys, &cursor->pos); xbt_dynar_cursor_step(cursor->key_lens, &cursor->pos_len); } @@ -166,8 +169,8 @@ xbt_dict_cursor_step(xbt_dict_cursor_t cursor) { */ int xbt_dict_cursor_get_or_free(xbt_dict_cursor_t *cursor, - char **key, - void **data) { + char **key, + void **data) { xbt_error_t errcode = no_error; int key_len = 0; -- 2.20.1