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
Whitespace cleanup.
[simgrid.git]
/
src
/
xbt
/
dict_cursor.c
diff --git
a/src/xbt/dict_cursor.c
b/src/xbt/dict_cursor.c
index
44f9f56
..
790536c
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
, 2005, 2006, 2007, 2008, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2004
-2013
. 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
@@
-12,7
+12,6
@@
#include <string.h> /* strlen() */
#include <string.h> /* 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");
@@
-21,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 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*/
@@
-51,10
+45,8
@@
XBT_INLINE xbt_dict_cursor_t xbt_dict_cursor_new(const xbt_dict_t dict)
*/
XBT_INLINE void xbt_dict_cursor_free(xbt_dict_cursor_t * cursor)
{
*/
XBT_INLINE void xbt_dict_cursor_free(xbt_dict_cursor_t * cursor)
{
- if (*cursor) {
- xbt_free(*cursor);
- *cursor = NULL;
- }
+ xbt_free(*cursor);
+ *cursor = NULL;
}
/*
}
/*
@@
-199,10
+191,5
@@
XBT_INLINE void xbt_dict_cursor_set_data(xbt_dict_cursor_t cursor,
void_f_pvoid_t free_ctn)
{
__cursor_not_null(cursor);
void_f_pvoid_t free_ctn)
{
__cursor_not_null(cursor);
- if (cursor->current->free_f)
- cursor->current->free_f(cursor->current->content);
-
- cursor->current->content = data;
- cursor->current->free_f = free_ctn;
- return;
+ xbt_dictelm_set_data(cursor->dict, cursor->current, data, free_ctn);
}
}