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
Revert "clean the build of the jarfile so that it works with cmake >= 2.8.12 too"
[simgrid.git]
/
src
/
xbt
/
dict_cursor.c
diff --git
a/src/xbt/dict_cursor.c
b/src/xbt/dict_cursor.c
index
7141a17
..
c39e65d
100644
(file)
--- a/
src/xbt/dict_cursor.c
+++ b/
src/xbt/dict_cursor.c
@@
-1,6
+1,6
@@
/* dict_cursor - iterators over dictionnaries */
/* dict_cursor - iterators over dictionnaries */
-/* Copyright (c) 2004-201
1
. The SimGrid Team.
+/* Copyright (c) 2004-201
3
. 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
@@
-20,11
+20,6
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict_cursor, xbt_dict,
/* To traverse (simple) dicts */
/* Don't add or remove entries to the dict while traversing !!! */
/*###########################################################################*/
/* To traverse (simple) dicts */
/* Don't add or remove entries to the dict while traversing !!! */
/*###########################################################################*/
-struct s_xbt_dict_cursor {
- xbt_dictelm_t current;
- int line;
- xbt_dict_t dict;
-};
#undef xbt_dict_CURSOR_DEBUG
/*#define xbt_dict_CURSOR_DEBUG 1*/
#undef xbt_dict_CURSOR_DEBUG
/*#define xbt_dict_CURSOR_DEBUG 1*/
@@
-86,9
+81,9
@@
XBT_INLINE void xbt_dict_cursor_rewind(xbt_dict_cursor_t cursor)
XBT_INLINE void xbt_dict_cursor_first(const xbt_dict_t dict,
xbt_dict_cursor_t * cursor)
{
XBT_INLINE void xbt_dict_cursor_first(const xbt_dict_t dict,
xbt_dict_cursor_t * cursor)
{
- XBT_
DEBUG(
"xbt_dict_cursor_first");
+ XBT_
CDEBUG(xbt_dict_cursor,
"xbt_dict_cursor_first");
if (!*cursor) {
if (!*cursor) {
- XBT_
DEBUG(
"Create the cursor on first use");
+ XBT_
CDEBUG(xbt_dict_cursor,
"Create the cursor on first use");
*cursor = xbt_dict_cursor_new(dict);
} else {
xbt_dict_cursor_rewind(*cursor);
*cursor = xbt_dict_cursor_new(dict);
} else {
xbt_dict_cursor_rewind(*cursor);
@@
-107,7
+102,7
@@
XBT_INLINE void xbt_dict_cursor_step(xbt_dict_cursor_t cursor)
xbt_dictelm_t current;
int line;
xbt_dictelm_t current;
int line;
- XBT_
DEBUG(
"xbt_dict_cursor_step");
+ XBT_
CDEBUG(xbt_dict_cursor,
"xbt_dict_cursor_step");
xbt_assert(cursor);
current = cursor->current;
xbt_assert(cursor);
current = cursor->current;
@@
-116,17
+111,17
@@
XBT_INLINE void xbt_dict_cursor_step(xbt_dict_cursor_t cursor)
if (cursor->dict != NULL) {
if (current != NULL) {
if (cursor->dict != NULL) {
if (current != NULL) {
- XBT_
DEBUG(
"current is not null, take the next element");
+ XBT_
CDEBUG(xbt_dict_cursor,
"current is not null, take the next element");
current = current->next;
current = current->next;
- XBT_
DEBUG(
"next element: %p", current);
+ XBT_
CDEBUG(xbt_dict_cursor,
"next element: %p", current);
}
while (current == NULL && ++line <= cursor->dict->table_size) {
}
while (current == NULL && ++line <= cursor->dict->table_size) {
- XBT_
DEBUG(
"current is NULL, take the next line");
+ XBT_
CDEBUG(xbt_dict_cursor,
"current is NULL, take the next line");
current = cursor->dict->table[line];
current = cursor->dict->table[line];
- XBT_
DEBUG(
"element in the next line: %p", current);
+ XBT_
CDEBUG(xbt_dict_cursor,
"element in the next line: %p", current);
}
}
- XBT_
DEBUG(
"search finished, current = %p, line = %d", current, line);
+ XBT_
CDEBUG(xbt_dict_cursor,
"search finished, current = %p, line = %d", current, line);
cursor->current = current;
cursor->line = line;
cursor->current = current;
cursor->line = line;
@@
-144,7
+139,7
@@
XBT_INLINE int xbt_dict_cursor_get_or_free(xbt_dict_cursor_t * cursor,
xbt_dictelm_t current;
xbt_dictelm_t current;
- XBT_
DEBUG(
"xbt_dict_get_or_free");
+ XBT_
CDEBUG(xbt_dict_cursor,
"xbt_dict_get_or_free");
if (!cursor || !(*cursor))
if (!cursor || !(*cursor))