/* dict_cursor - iterators over dictionaries */
-/* Copyright (c) 2004-2014. The SimGrid Team.
+/* Copyright (c) 2004-2018. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
/* Don't add or remove entries to the dict while traversing !!! */
/*###########################################################################*/
-#undef xbt_dict_CURSOR_DEBUG
-/*#define xbt_dict_CURSOR_DEBUG 1*/
-
/** @brief Creator
* @param dict the dict
*/
inline 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);
+ xbt_dict_cursor_t res = xbt_new(struct s_xbt_dict_cursor, 1);
res->dict = dict;
xbt_dict_cursor_rewind(res);
}
}
-/** \brief Move to the next element. */
+/** @brief Move to the next element. */
inline void xbt_dict_cursor_step(xbt_dict_cursor_t cursor)
{
xbt_dictelm_t current;
XBT_CDEBUG(xbt_dict_cursor, "next element: %p", current);
}
- while (current == NULL && ++line <= cursor->dict->table_size) {
+ while (current == NULL && (line + 1) <= cursor->dict->table_size) {
+ line++;
XBT_CDEBUG(xbt_dict_cursor, "current is NULL, take the next line");
current = cursor->dict->table[line];
XBT_CDEBUG(xbt_dict_cursor, "element in the next line: %p", current);
XBT_CDEBUG(xbt_dict_cursor, "xbt_dict_get_or_free");
if (!cursor || !(*cursor))
- return FALSE;
+ return 0;
current = (*cursor)->current;
if (current == NULL) { /* no data left */
xbt_dict_cursor_free(cursor);
- return FALSE;
+ return 0;
}
*key = current->key;
*data = current->content;
- return TRUE;
+ return 1;
}
/**
return cursor->current->content;
}
-
-/**
- * @brief Set current data
- * @param cursor the cursor
- * @param data the new data
- * @param free_ctn the function to free the new data
- */
-inline void xbt_dict_cursor_set_data(xbt_dict_cursor_t cursor, void *data, void_f_pvoid_t free_ctn)
-{
- __cursor_not_null(cursor);
- xbt_dictelm_set_data(cursor->dict, cursor->current, data, free_ctn);
-}