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
Use new macros THROWF and RETHROWF.
[simgrid.git]
/
src
/
xbt
/
dynar.c
diff --git
a/src/xbt/dynar.c
b/src/xbt/dynar.c
index
9d5de7d
..
4b69794
100644
(file)
--- a/
src/xbt/dynar.c
+++ b/
src/xbt/dynar.c
@@
-47,7
+47,7
@@
static XBT_INLINE void _check_inbound_idx(xbt_dynar_t dynar, int idx)
{
if (idx < 0 || idx >= dynar->used) {
_dynar_unlock(dynar);
- THROW
2
(bound_error, idx,
+ THROW
F
(bound_error, idx,
"dynar is not that long. You asked %d, but it's only %lu long",
(int) (idx), (unsigned long) dynar->used);
}
@@
-58,7
+58,7
@@
static XBT_INLINE void _check_sloppy_inbound_idx(xbt_dynar_t dynar,
{
if (idx > dynar->used) {
_dynar_unlock(dynar);
- THROW
2
(bound_error, idx,
+ THROW
F
(bound_error, idx,
"dynar is not that long. You asked %d, but it's only %lu long (could have been equal to it)",
(int) (idx), (unsigned long) dynar->used);
}
@@
-68,7
+68,7
@@
static XBT_INLINE void _check_populated_dynar(xbt_dynar_t dynar)
{
if (dynar->used == 0) {
_dynar_unlock(dynar);
- THROW
1
(bound_error, 0, "dynar %p is empty", dynar);
+ THROW
F
(bound_error, 0, "dynar %p is empty", dynar);
}
}
@@
-327,7
+327,8
@@
XBT_INLINE void xbt_dynar_free(xbt_dynar_t * dynar)
/** \brief free a dynar passed as void* (handy to store dynar in dynars or dict) */
void xbt_dynar_free_voidp(void *d)
{
- xbt_dynar_free((xbt_dynar_t *) d);
+ xbt_dynar_t dynar = (xbt_dynar_t)d;
+ xbt_dynar_free(&dynar);
}
/** @brief Count of dynar's elements
@@
-570,7
+571,7
@@
unsigned int xbt_dynar_search(xbt_dynar_t const dynar, void *const elem)
}
_dynar_unlock(dynar);
- THROW
2
(not_found_error, 0, "Element %p not part of dynar %p", elem,
+ THROW
F
(not_found_error, 0, "Element %p not part of dynar %p", elem,
dynar);
}
@@
-775,16
+776,19
@@
XBT_INLINE int xbt_dynar_compare(xbt_dynar_t d1, xbt_dynar_t d2,
if((!d1) || (!d2))
{
XBT_DEBUG("NULL dynar d1=%p d2=%p",d1,d2);
+ xbt_dynar_free(&d2);
return 1;
}
if((d1->elmsize)!=(d2->elmsize))
{
XBT_DEBUG("Size of elmsize d1=%ld d2=%ld",d1->elmsize,d2->elmsize);
+ xbt_dynar_free(&d2);
return 1; // xbt_die
}
if(xbt_dynar_length(d1) != xbt_dynar_length(d2))
{
XBT_DEBUG("Size of dynar d1=%ld d2=%ld",xbt_dynar_length(d1),xbt_dynar_length(d2));
+ xbt_dynar_free(&d2);
return 1;
}
@@
-794,8
+798,12
@@
XBT_INLINE int xbt_dynar_compare(xbt_dynar_t d1, xbt_dynar_t d2,
void *data1 = xbt_dynar_get_as(d1, i, void *);
void *data2 = xbt_dynar_get_as(d2, i, void *);
XBT_DEBUG("link[%d] d1=%p d2=%p",i,data1,data2);
- if(compar(data1,data2)) return 1;
+ if(compar(data1,data2)){
+ xbt_dynar_free(&d2);
+ return 1;
+ }
}
+ xbt_dynar_free(&d2);
return 0;
}