A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't depend on <stdbool.h>.
[simgrid.git]
/
src
/
xbt
/
dict_cursor.c
diff --git
a/src/xbt/dict_cursor.c
b/src/xbt/dict_cursor.c
index
38c7930
..
f6b6a3d
100644
(file)
--- a/
src/xbt/dict_cursor.c
+++ b/
src/xbt/dict_cursor.c
@@
-1,6
+1,6
@@
/* dict_cursor - iterators over dictionaries */
/* dict_cursor - iterators over dictionaries */
-/* Copyright (c) 2004-201
4
. The SimGrid Team.
+/* Copyright (c) 2004-201
8
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-19,15
+19,12
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict_cursor, xbt_dict, "To traverse dictiona
/* Don't add or remove entries to the dict while traversing !!! */
/*###########################################################################*/
/* 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)
{
/** @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 = xbt_new(s
_xbt_dict_cursor_t
, 1);
+ xbt_dict_cursor_t res = xbt_new(s
truct s_xbt_dict_cursor
, 1);
res->dict = dict;
xbt_dict_cursor_rewind(res);
res->dict = dict;
xbt_dict_cursor_rewind(res);
@@
-131,17
+128,17
@@
inline int xbt_dict_cursor_get_or_free(xbt_dict_cursor_t * cursor, char **key, v
XBT_CDEBUG(xbt_dict_cursor, "xbt_dict_get_or_free");
if (!cursor || !(*cursor))
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);
current = (*cursor)->current;
if (current == NULL) { /* no data left */
xbt_dict_cursor_free(cursor);
- return
FALSE
;
+ return
0
;
}
*key = current->key;
*data = current->content;
}
*key = current->key;
*data = current->content;
- return
TRUE
;
+ return
1
;
}
/**
}
/**
@@
-172,10
+169,10
@@
inline void *xbt_dict_cursor_get_data(xbt_dict_cursor_t cursor)
* @brief Set current data
* @param cursor the cursor
* @param data the new data
* @brief Set current data
* @param cursor the cursor
* @param data the new data
- * @param free_ctn
the function to free the new data
+ * @param free_ctn
unused parameter (kept for compatibility)
*/
*/
-inline void xbt_dict_cursor_set_data(xbt_dict_cursor_t cursor, void
*data,
void_f_pvoid_t free_ctn)
+inline void xbt_dict_cursor_set_data(xbt_dict_cursor_t cursor, void
* data, XBT_ATTRIB_UNUSED
void_f_pvoid_t free_ctn)
{
__cursor_not_null(cursor);
{
__cursor_not_null(cursor);
- xbt_dictelm_set_data(cursor->dict, cursor->current, data
, free_ctn
);
+ xbt_dictelm_set_data(cursor->dict, cursor->current, data);
}
}