void xbt_dynar_free_container(xbt_dynar_t * dynar)
{
if (dynar && *dynar) {
-
- if ((*dynar)->data) {
- _xbt_clear_mem((*dynar)->data, (*dynar)->size);
- free((*dynar)->data);
- }
-
- if ((*dynar)->mutex)
- xbt_mutex_destroy((*dynar)->mutex);
-
- _xbt_clear_mem(*dynar, sizeof(s_xbt_dynar_t));
-
- free(*dynar);
+ xbt_dynar_t d = *dynar;
+ free(d->data);
+ if (d->mutex)
+ xbt_mutex_destroy(d->mutex);
+ free(d);
*dynar = NULL;
}
}
_dynar_lock(dynar);
_sanity_check_dynar(dynar);
- _xbt_dynar_expand(dynar, idx + 1);
-
if (idx >= dynar->used) {
+ _xbt_dynar_expand(dynar, idx + 1);
_xbt_clear_mem(((char * const)dynar->data) + dynar->used * dynar->elmsize,
(idx + 1 - dynar->used)*dynar->elmsize);
dynar->used = idx + 1;
_sanity_check_dynar(dynar);
- _xbt_dynar_expand(dynar, idx + 1);
-
if (idx >= dynar->used) {
+ _xbt_dynar_expand(dynar, idx + 1);
_xbt_clear_mem(((char * const)dynar->data) + dynar->used * dynar->elmsize,
(idx + 1 - dynar->used)*dynar->elmsize);
dynar->used = idx + 1;
"The retrieved value is not the same than the injected one (%d!=%d)",
cursor, cpt);
}
- xbt_test_assert(xbt_dynar_length(d) == 0,
+ xbt_test_assert(xbt_dynar_is_empty(d),
"There is still %lu elements in the dynar after removing everything",
xbt_dynar_length(d));
xbt_dynar_free(&d);
"The retrieved value is not the same than the injected one (%d!=%d)",
cursor, cpt);
}
- xbt_test_assert(xbt_dynar_length(d) == 0,
+ xbt_test_assert(xbt_dynar_is_empty(d),
"There is still %lu elements in the dynar after removing everything",
xbt_dynar_length(d));
xbt_dynar_free(&d);