X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/96cedde3cdbc0b8ffc3f096a1b65d021b0226f99..6582744db5a014857b7a914815b147e88adead81:/src/xbt/dict_cursor.c diff --git a/src/xbt/dict_cursor.c b/src/xbt/dict_cursor.c index 5ee224a727..7ec5ffd563 100644 --- a/src/xbt/dict_cursor.c +++ b/src/xbt/dict_cursor.c @@ -1,6 +1,6 @@ /* dict_cursor - iterators over dictionaries */ -/* Copyright (c) 2004-2019. The SimGrid Team. +/* Copyright (c) 2004-2023. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -22,7 +22,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict_cursor, xbt_dict, "To traverse dictiona /** @brief Creator * @param dict the dict */ -inline xbt_dict_cursor_t xbt_dict_cursor_new(const xbt_dict_t dict) +inline xbt_dict_cursor_t xbt_dict_cursor_new(const_xbt_dict_t dict) { xbt_dict_cursor_t res = xbt_new(struct s_xbt_dict_cursor, 1); res->dict = dict; @@ -45,7 +45,7 @@ inline void xbt_dict_cursor_free(xbt_dict_cursor_t * cursor) /* * Sanity check to see if the head contains something */ -static inline void __cursor_not_null(xbt_dict_cursor_t cursor) +static inline void __cursor_not_null(const_xbt_dict_cursor_t cursor) { xbt_assert(cursor, "Null cursor"); } @@ -70,7 +70,7 @@ inline void xbt_dict_cursor_rewind(xbt_dict_cursor_t cursor) * @param dict on what to let the cursor iterate * @param[out] cursor dest address */ -inline void xbt_dict_cursor_first(const xbt_dict_t dict, xbt_dict_cursor_t * cursor) +inline void xbt_dict_cursor_first(const_xbt_dict_t dict, xbt_dict_cursor_t* cursor) { XBT_CDEBUG(xbt_dict_cursor, "xbt_dict_cursor_first"); if (!*cursor) { @@ -123,7 +123,7 @@ inline void xbt_dict_cursor_step(xbt_dict_cursor_t cursor) */ inline int xbt_dict_cursor_get_or_free(xbt_dict_cursor_t * cursor, char **key, void **data) { - xbt_dictelm_t current; + const struct s_xbt_dictelm* current; XBT_CDEBUG(xbt_dict_cursor, "xbt_dict_get_or_free"); @@ -146,7 +146,7 @@ inline int xbt_dict_cursor_get_or_free(xbt_dict_cursor_t * cursor, char **key, v * @param cursor: the cursor * @returns the current key */ -inline char *xbt_dict_cursor_get_key(xbt_dict_cursor_t cursor) +inline char* xbt_dict_cursor_get_key(const_xbt_dict_cursor_t cursor) { __cursor_not_null(cursor); @@ -158,7 +158,7 @@ inline char *xbt_dict_cursor_get_key(xbt_dict_cursor_t cursor) * @param cursor the cursor * @returns the current data */ -inline void *xbt_dict_cursor_get_data(xbt_dict_cursor_t cursor) +inline void* xbt_dict_cursor_get_data(const_xbt_dict_cursor_t cursor) { __cursor_not_null(cursor);