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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into LLL
[simgrid.git]
/
src
/
xbt
/
dict_multi.c
diff --git
a/src/xbt/dict_multi.c
b/src/xbt/dict_multi.c
index
f196c66
..
0c2e692
100644
(file)
--- a/
src/xbt/dict_multi.c
+++ b/
src/xbt/dict_multi.c
@@
-95,7
+95,8
@@
xbt_multidict_set(xbt_dict_t mdict,
TRY {
xbt_multidict_set_ext(mdict, keys, lens, data, free_ctn);
TRY {
xbt_multidict_set_ext(mdict, keys, lens, data, free_ctn);
- } TRY_CLEANUP {
+ }
+ TRY_CLEANUP {
xbt_dynar_free(&lens);
}
CATCH_ANONYMOUS {
xbt_dynar_free(&lens);
}
CATCH_ANONYMOUS {
@@
-124,7
+125,7
@@
void *xbt_multidict_get_ext(xbt_dict_t mdict,
int keys_len = xbt_dynar_length(keys);
xbt_assert(xbt_dynar_length(keys) == xbt_dynar_length(lens));
int keys_len = xbt_dynar_length(keys);
xbt_assert(xbt_dynar_length(keys) == xbt_dynar_length(lens));
- xbt_assert(
xbt_dynar_length(keys) >= 1
,
+ xbt_assert(
!xbt_dynar_is_empty(keys)
,
"Can't get a zero-long key set in a multidict");
XBT_DEBUG("xbt_multidict_get(%p, %ld)", mdict, xbt_dynar_length(keys));
"Can't get a zero-long key set in a multidict");
XBT_DEBUG("xbt_multidict_get(%p, %ld)", mdict, xbt_dynar_length(keys));
@@
-182,8
+183,9
@@
void
xbt_multidict_remove_ext(xbt_dict_t mdict, xbt_dynar_t keys,
xbt_dynar_t lens)
{
xbt_multidict_remove_ext(xbt_dict_t mdict, xbt_dynar_t keys,
xbt_dynar_t lens)
{
- xbt_dict_t thislevel, nextlevel = NULL;
- int i;
+ volatile xbt_dict_t thislevel;
+ volatile xbt_dict_t nextlevel = NULL;
+ volatile int i;
xbt_ex_t e;
unsigned long int thislen;
xbt_ex_t e;
unsigned long int thislen;
@@
-232,7
+234,8
@@
void xbt_multidict_remove(xbt_dict_t mdict, xbt_dynar_t keys)
TRY {
xbt_multidict_remove_ext(mdict, keys, lens);
TRY {
xbt_multidict_remove_ext(mdict, keys, lens);
- } TRY_CLEANUP {
+ }
+ TRY_CLEANUP {
xbt_dynar_free(&lens);
}
CATCH_ANONYMOUS {
xbt_dynar_free(&lens);
}
CATCH_ANONYMOUS {