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 xbt_malloc (and friends) instead of direct malloc()
[simgrid.git]
/
src
/
xbt
/
heap.c
diff --git
a/src/xbt/heap.c
b/src/xbt/heap.c
index
a91e006
..
e124aab
100644
(file)
--- a/
src/xbt/heap.c
+++ b/
src/xbt/heap.c
@@
-95,7
+95,7
@@
void xbt_heap_push(xbt_heap_t H, void *content, double key)
if (count > size) {
H->size = (size << 1) + 1;
H->items =
if (count > size) {
H->size = (size << 1) + 1;
H->items =
- (void *) realloc(H->items,
+ (void *)
xbt_
realloc(H->items,
(H->size) * sizeof(struct xbt_heap_item));
}
(H->size) * sizeof(struct xbt_heap_item));
}
@@
-132,7
+132,7
@@
void *xbt_heap_pop(xbt_heap_t H)
if (H->count < size >> 2 && size > 16) {
size = (size >> 1) + 1;
H->items =
if (H->count < size >> 2 && size > 16) {
size = (size >> 1) + 1;
H->items =
- (void *) realloc(items,
+ (void *)
xbt_
realloc(items,
size * sizeof(struct xbt_heap_item));
H->size = size;
}
size * sizeof(struct xbt_heap_item));
H->size = size;
}
@@
-145,10
+145,10
@@
void *xbt_heap_pop(xbt_heap_t H)
/**
* @brief Extracts from the heap and returns the element at position i.
* \param H the heap we're working on
/**
* @brief Extracts from the heap and returns the element at position i.
* \param H the heap we're working on
- * \param i
element position
+ * \param i element position
* \return the element at position i if ok, NULL otherwise
*
* \return the element at position i if ok, NULL otherwise
*
- * Extracts from the heap and returns the element at position i. The hea
d
is automatically reorded.
+ * Extracts from the heap and returns the element at position i. The hea
p
is automatically reorded.
*/
void *xbt_heap_remove(xbt_heap_t H, int i)
{
*/
void *xbt_heap_remove(xbt_heap_t H, int i)
{