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
also fix xbt_dynar_set like xbt_dynar_set_at_ptr by not checking the idx validity...
[simgrid.git]
/
src
/
xbt
/
dict_multi.c
diff --git
a/src/xbt/dict_multi.c
b/src/xbt/dict_multi.c
index
4a55591
..
30ae0e1
100644
(file)
--- a/
src/xbt/dict_multi.c
+++ b/
src/xbt/dict_multi.c
@@
-1,6
+1,7
@@
/* dict_multi - dictionnaries of dictionnaries of ... of data */
/* dict_multi - dictionnaries of dictionnaries of ... of data */
-/* Copyright (c) 2003-2005 Martin Quinson. All rights reserved. */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-45,7
+46,8
@@
xbt_multidict_set_ext(xbt_dict_t mdict,
DEBUG2("xbt_multidict_set(%p,%d)", mdict, keys_len);
DEBUG2("xbt_multidict_set(%p,%d)", mdict, keys_len);
- for (i = 0, thislevel = mdict; i < keys_len - 1; i++, thislevel = nextlevel) {
+ for (i = 0, thislevel = mdict; i < keys_len - 1;
+ i++, thislevel = nextlevel) {
xbt_dynar_get_cpy(keys, i, &thiskey);
xbt_dynar_get_cpy(lens, i, &thislen);
xbt_dynar_get_cpy(keys, i, &thiskey);
xbt_dynar_get_cpy(lens, i, &thislen);
@@
-59,7
+61,8
@@
xbt_multidict_set_ext(xbt_dict_t mdict,
/* make sure the dict of next level exists */
nextlevel = xbt_dict_new();
VERB1("Create a dict (%p)", nextlevel);
/* make sure the dict of next level exists */
nextlevel = xbt_dict_new();
VERB1("Create a dict (%p)", nextlevel);
- xbt_dict_set_ext(thislevel, thiskey, thislen, nextlevel, &_free_dict);
+ xbt_dict_set_ext(thislevel, thiskey, thislen, nextlevel,
+ &_free_dict);
}
}
}
}
@@
-93,7
+96,7
@@
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);
- } CLEANUP {
+ }
TRY_
CLEANUP {
xbt_dynar_free(&lens);
} CATCH(e) {
RETHROW;
xbt_dynar_free(&lens);
} CATCH(e) {
RETHROW;
@@
-126,7
+129,8
@@
void *xbt_multidict_get_ext(xbt_dict_t mdict,
DEBUG2("xbt_multidict_get(%p, %ld)", mdict, xbt_dynar_length(keys));
DEBUG2("xbt_multidict_get(%p, %ld)", mdict, xbt_dynar_length(keys));
- for (i = 0, thislevel = mdict; i < keys_len - 1; i++, thislevel = nextlevel) {
+ for (i = 0, thislevel = mdict; i < keys_len - 1;
+ i++, thislevel = nextlevel) {
xbt_dynar_get_cpy(keys, i, &thiskey);
xbt_dynar_get_cpy(lens, i, &thislen);
xbt_dynar_get_cpy(keys, i, &thiskey);
xbt_dynar_get_cpy(lens, i, &thislen);
@@
-175,7
+179,8
@@
void *xbt_multidict_get(xbt_dict_t mdict, xbt_dynar_t keys)
*/
void
*/
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;
{
xbt_dict_t thislevel, nextlevel = NULL;
int i;
@@
-189,7
+194,8
@@
xbt_multidict_remove_ext(xbt_dict_t mdict, xbt_dynar_t keys, xbt_dynar_t lens)
xbt_assert0(xbt_dynar_length(keys),
"Can't remove a zero-long key set in a multidict");
xbt_assert0(xbt_dynar_length(keys),
"Can't remove a zero-long key set in a multidict");
- for (i = 0, thislevel = mdict; i < keys_len - 1; i++, thislevel = nextlevel) {
+ for (i = 0, thislevel = mdict; i < keys_len - 1;
+ i++, thislevel = nextlevel) {
xbt_dynar_get_cpy(keys, i, &thiskey);
xbt_dynar_get_cpy(lens, i, &thislen);
xbt_dynar_get_cpy(keys, i, &thiskey);
xbt_dynar_get_cpy(lens, i, &thislen);
@@
-228,7
+234,7
@@
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);
- } CLEANUP {
+ }
TRY_
CLEANUP {
xbt_dynar_free(&lens);
} CATCH(e) {
RETHROW;
xbt_dynar_free(&lens);
} CATCH(e) {
RETHROW;