/* lib - a generic library, variation over dictionary */
-/* Copyright (c) 2011, 2013-2014. The SimGrid Team.
+/* Copyright (c) 2011, 2013-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
xbt_dict_foreach (lib->dict, cursor, key, elts) {
int i;
for (i = 0 ; i < lib->levels ; i++)
- if (elts[i])
+ if (elts[i] && lib->free_f[i])
lib->free_f[i](elts[i]);
}
xbt_dict_free(&lib->dict);
if (elts[level]) {
XBT_DEBUG("Replace %p by %p element under key '%s:%d'",
elts[level], obj, key, level);
- lib->free_f[level](elts[level]);
+ if (lib->free_f[level])
+ lib->free_f[level](elts[level]);
}
elts[level] = obj;
}
xbt_dict_remove(lib->dict, key);
}
- if (invoke_callback)
+ if (invoke_callback && lib->free_f[level])
lib->free_f[level](obj);
}