X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/43af7aead466095c362d1cd34d2ddd51ae4f3ce0..d001b03dcee41695c0bf66206429c364a89321eb:/src/xbt/heap.c

diff --git a/src/xbt/heap.c b/src/xbt/heap.c
index 95513b759d..b6cea7c0e2 100644
--- a/src/xbt/heap.c
+++ b/src/xbt/heap.c
@@ -5,7 +5,9 @@
 /* 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. */
 
-#include "xbt_heap_private.h"
+#include "xbt/sysdep.h"
+#include "xbt/error.h"
+#include "heap_private.h"
 
 /**
  * xbt_heap_new:
@@ -16,12 +18,12 @@
  */
 xbt_heap_t xbt_heap_new(int init_size, void_f_pvoid_t * const free_func)
 {
-  xbt_heap_t H = calloc(1, sizeof(struct xbt_heap));
+  xbt_heap_t H = xbt_new0(struct xbt_heap, 1);
   H->size = init_size;
   H->count = 0;
   H->items =
-      (xbt_heapItem_t) calloc(init_size, sizeof(struct xbt_heapItem));
-  H->free = free;
+      (xbt_heapItem_t) xbt_new0(struct xbt_heapItem, init_size);
+  H->free = free_func;
   return H;
 }
 
@@ -37,8 +39,8 @@ void xbt_heap_free(xbt_heap_t H)
   if (H->free)
     for (i = 0; i < H->size; i++)
       H->free(H->items[i].content);
-  free(H->items);
-  free(H);
+  xbt_free(H->items);
+  xbt_free(H);
   return;
 }
 
@@ -121,7 +123,7 @@ void *xbt_heap_maxcontent(xbt_heap_t H)
  * 
  * Restores the heap property once an element has been deleted.
  */
-void xbt_heap_maxHeapify(xbt_heap_t H)
+static void xbt_heap_maxHeapify(xbt_heap_t H)
 {
   int i = 0;
   while (1) {
@@ -151,7 +153,7 @@ void xbt_heap_maxHeapify(xbt_heap_t H)
  * Moves up an item at position i to its correct position. Works only
  * when called from xbt_heap_push. Do not use otherwise.
  */
-void xbt_heap_increaseKey(xbt_heap_t H, int i)
+static void xbt_heap_increaseKey(xbt_heap_t H, int i)
 {
   while (i > 0 && KEY(H, PARENT(i)) > KEY(H, i)) {
     struct xbt_heapItem tmp = H->items[i];