X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4725d7a4bc5ac1fdae3e86222cdc23eaaf6fb226..725184f3bce66a3eff87cc3a01e5d96477a5d28a:/src/xbt/dict_cursor.c diff --git a/src/xbt/dict_cursor.c b/src/xbt/dict_cursor.c index eb93f6928c..1808ab8ba0 100644 --- a/src/xbt/dict_cursor.c +++ b/src/xbt/dict_cursor.c @@ -11,10 +11,11 @@ #include "xbt/ex.h" #include "dict_private.h" -#include /* strlen() */ +#include /* strlen() */ XBT_LOG_EXTERNAL_CATEGORY(xbt_dict); -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict_cursor,xbt_dict,"To traverse dictionaries"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict_cursor, xbt_dict, + "To traverse dictionaries"); /*####[ Dict cursor functions ]#############################################*/ @@ -33,7 +34,8 @@ struct xbt_dict_cursor_ { /** @brief Creator * @param dict the dict */ -xbt_dict_cursor_t xbt_dict_cursor_new(const xbt_dict_t dict) { +xbt_dict_cursor_t xbt_dict_cursor_new(const xbt_dict_t dict) +{ xbt_dict_cursor_t res = NULL; res = xbt_new(s_xbt_dict_cursor_t, 1); @@ -48,7 +50,8 @@ xbt_dict_cursor_t xbt_dict_cursor_new(const xbt_dict_t dict) { * @brief Destructor * @param cursor poor victim */ -void xbt_dict_cursor_free(xbt_dict_cursor_t *cursor) { +void xbt_dict_cursor_free(xbt_dict_cursor_t * cursor) +{ if (*cursor) { xbt_free(*cursor); *cursor = NULL; @@ -58,21 +61,22 @@ void xbt_dict_cursor_free(xbt_dict_cursor_t *cursor) { /* * Sanity check to see if the head contains something */ -static XBT_INLINE void __cursor_not_null(xbt_dict_cursor_t cursor) { +static XBT_INLINE void __cursor_not_null(xbt_dict_cursor_t cursor) +{ xbt_assert0(cursor, "Null cursor"); } /** @brief Reinitialize the cursor. Mandatory after removal or add in dict. */ -void xbt_dict_cursor_rewind(xbt_dict_cursor_t cursor) { +void xbt_dict_cursor_rewind(xbt_dict_cursor_t cursor) +{ CDEBUG0(xbt_dict_cursor, "xbt_dict_cursor_rewind"); xbt_assert(cursor); cursor->line = 0; if (cursor->dict != NULL) { cursor->current = cursor->dict->table[0]; - } - else { + } else { cursor->current = NULL; } } @@ -83,18 +87,17 @@ void xbt_dict_cursor_rewind(xbt_dict_cursor_t cursor) { * @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){ +void xbt_dict_cursor_first(const xbt_dict_t dict, xbt_dict_cursor_t * cursor) +{ DEBUG0("xbt_dict_cursor_first"); if (!*cursor) { DEBUG0("Create the cursor on first use"); *cursor = xbt_dict_cursor_new(dict); - } - else { + } else { xbt_dict_cursor_rewind(*cursor); } if (dict != NULL && (*cursor)->current == NULL) { - xbt_dict_cursor_step(*cursor); /* find the first element */ + xbt_dict_cursor_step(*cursor); /* find the first element */ } } @@ -102,10 +105,11 @@ void xbt_dict_cursor_first(const xbt_dict_t dict, /** * \brief Move to the next element. */ -void xbt_dict_cursor_step(xbt_dict_cursor_t cursor) { +void xbt_dict_cursor_step(xbt_dict_cursor_t cursor) +{ - xbt_dictelm_t current ; + xbt_dictelm_t current; int line; DEBUG0("xbt_dict_cursor_step"); @@ -139,9 +143,9 @@ void xbt_dict_cursor_step(xbt_dict_cursor_t cursor) { * * @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) { +int xbt_dict_cursor_get_or_free(xbt_dict_cursor_t * cursor, + char **key, void **data) +{ xbt_dictelm_t current; @@ -152,7 +156,7 @@ int xbt_dict_cursor_get_or_free(xbt_dict_cursor_t *cursor, return FALSE; current = (*cursor)->current; - if (current == NULL) { /* no data left */ + if (current == NULL) { /* no data left */ xbt_dict_cursor_free(cursor); return FALSE; } @@ -167,7 +171,8 @@ int xbt_dict_cursor_get_or_free(xbt_dict_cursor_t *cursor, * @param cursor: the cursor * @returns the current key */ -char *xbt_dict_cursor_get_key(xbt_dict_cursor_t cursor) { +char *xbt_dict_cursor_get_key(xbt_dict_cursor_t cursor) +{ __cursor_not_null(cursor); return cursor->current->key; @@ -178,10 +183,9 @@ char *xbt_dict_cursor_get_key(xbt_dict_cursor_t cursor) { * @param cursor the cursor * @returns the current data */ -void *xbt_dict_cursor_get_data(xbt_dict_cursor_t cursor) { +void *xbt_dict_cursor_get_data(xbt_dict_cursor_t cursor) +{ __cursor_not_null(cursor); return cursor->current->content; } - -