X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/baa212aa2fc1e0f91b0e9a9536db52f1657331a8..6521142974bf561e632684f99fd1708726e474a0:/src/xbt/dict_cursor.c diff --git a/src/xbt/dict_cursor.c b/src/xbt/dict_cursor.c index d75e811870..1827eeb8b3 100644 --- a/src/xbt/dict_cursor.c +++ b/src/xbt/dict_cursor.c @@ -8,6 +8,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "xbt/misc.h" +#include "xbt/ex.h" #include "dict_private.h" #include /* strlen() */ @@ -36,13 +37,8 @@ _cursor_push_keys(xbt_dict_cursor_t p_cursor, #undef xbt_dict_CURSOR_DEBUG /*#define xbt_dict_CURSOR_DEBUG 1*/ -/** - * xbt_dict_cursor_new: - * - * @head: the head of the dict - * @cursor: the curent position in the dict - * - * Structure creator +/** @brief Creator + * @param head the dict */ xbt_dict_cursor_t xbt_dict_cursor_new(const xbt_dict_t head) { @@ -61,38 +57,30 @@ xbt_dict_cursor_new(const xbt_dict_t head) { } /** - * xbt_dict_cursor_free: - * - * @cursor: poor victim - * - * Structure destructor + * @brief Destructor + * @param cursor poor victim */ void xbt_dict_cursor_free(xbt_dict_cursor_t *cursor) { if (*cursor) { xbt_dynar_free(&((*cursor)->keys)); xbt_dynar_free(&((*cursor)->key_lens)); - xbt_free(*cursor); + free(*cursor); *cursor = NULL; } } -/** - * __cursor_not_null: - * +/* * Sanity check to see if the head contains something */ static _XBT_INLINE -xbt_error_t +void __cursor_not_null(xbt_dict_cursor_t cursor) { xbt_assert0(cursor, "Null cursor"); - if (!cursor->head) { - return mismatch_error; - } - - return no_error; + if (!cursor->head) + THROW0(arg_error,0,"Null headed cursor"); } @@ -104,9 +92,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++; @@ -120,13 +108,7 @@ _cursor_push_keys(xbt_dict_cursor_t cursor, CDEBUG1(dict_cursor, "Count = %d", count); } -/** - * xbt_dict_cursor_rewind: - * @cursor: the cursor - * @Returns: xbt_error_t - * - * back to the first element - */ +/** @brief Reinitialize the cursor. Mandatory after removal or add in dict. */ void xbt_dict_cursor_rewind(xbt_dict_cursor_t cursor) { @@ -147,11 +129,10 @@ xbt_dict_cursor_rewind(xbt_dict_cursor_t cursor) { } /** - * xbt_dict_cursor_first: - * @dict: on what to let the cursor iterate - * @cursor: dest address + * @brief Create the cursor if it does not exists. Rewind it in any case. * - * Create the cursor if it does not exists. Rewind it in any case. + * @param dict on what to let the cursor iterate + * @param[out] cursor dest address */ void xbt_dict_cursor_first (const xbt_dict_t dict, xbt_dict_cursor_t *cursor){ @@ -166,32 +147,30 @@ void xbt_dict_cursor_first (const xbt_dict_t dict, /** - * xbt_dict_cursor_step: - * @cursor: the cursor - * - * Move to the next element. + * \brief Move to the next element. */ 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); } /** - * xbt_dict_cursor_get_or_free: - * @cursor: the cursor - * @Returns: true if it's ok, false if there is no more data + * @brief Get current data, or free the cursor if there is no data left * - * Get current data + * @returns true if it's ok, false if there is no more data */ int xbt_dict_cursor_get_or_free(xbt_dict_cursor_t *cursor, - char **key, - void **data) { - xbt_error_t errcode = no_error; - int key_len = 0; + char **key, + void **data) { + int key_len = 0; + xbt_ex_t e; if (!cursor || !(*cursor)) return FALSE; @@ -204,60 +183,47 @@ xbt_dict_cursor_get_or_free(xbt_dict_cursor_t *cursor, *key = xbt_dynar_get_as((*cursor)->keys, (*cursor)->pos, char*); key_len = xbt_dynar_get_as((*cursor)->key_lens, (*cursor)->pos_len, int); - errcode = xbt_dictelm_get_ext((*cursor)->head, *key, key_len, data); - if (errcode == mismatch_error) { - xbt_dict_cursor_free(cursor); - return FALSE; + TRY { + *data = xbt_dictelm_get_ext((*cursor)->head, *key, key_len); + } CATCH(e) { + if (e.category == mismatch_error) { + xbt_dict_cursor_free(cursor); + xbt_ex_free(e); + return FALSE; + } + RETHROW; } - - xbt_assert1(errcode == no_error, - "Unexpected problem while retrieving the content of cursor. Got %s", - xbt_error_name(errcode)); - return TRUE; } /** - * xbt_dict_cursor_get_key: - * @cursor: the cursor - * @key: the current element - * @Returns: xbt_error_t - * - * Get current key + * @brief Get current key + * @param cursor: the cursor + * @returns the current key */ -xbt_error_t -xbt_dict_cursor_get_key(xbt_dict_cursor_t cursor, - /*OUT*/char **key) { - xbt_error_t errcode = no_error; - - TRY(__cursor_not_null(cursor)); +char * +xbt_dict_cursor_get_key(xbt_dict_cursor_t cursor) { + __cursor_not_null(cursor); - *key = xbt_dynar_get_as(cursor->keys, cursor->pos - 1, char*); - - return errcode; + return xbt_dynar_get_as(cursor->keys, cursor->pos - 1, char*); } /** - * xbt_dict_cursor_get_data: - * @cursor: the cursor - * - * Get current data + * @brief Get current data + * @param cursor the cursor + * @returns the current data */ -xbt_error_t -xbt_dict_cursor_get_data(xbt_dict_cursor_t cursor, - /*OUT*/void **data) { - xbt_error_t errcode = no_error; +void * +xbt_dict_cursor_get_data(xbt_dict_cursor_t cursor) { char *key = NULL; int key_len = 0; - TRY(__cursor_not_null(cursor)); + __cursor_not_null(cursor); key = xbt_dynar_get_as(cursor->keys, cursor->pos-1, char *); key_len = xbt_dynar_get_as(cursor->key_lens, cursor->pos_len-1, int); - TRY(xbt_dictelm_get_ext(cursor->head, key, key_len, data)); - - return errcode; + return xbt_dictelm_get_ext(cursor->head, key, key_len); }