X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/da8980cd59b9ddced3bd88bf21250c76c4f929c4..cdc5e6b304490c7f11223bea097fea9fd2a2dfee:/src/xbt/heap.c?ds=sidebyside

diff --git a/src/xbt/heap.c b/src/xbt/heap.c
index 5468fc3c96..d26166b5fa 100644
--- a/src/xbt/heap.c
+++ b/src/xbt/heap.c
@@ -61,7 +61,7 @@ void xbt_heap_free(xbt_heap_t H)
   int i;
   if (H->free)
     for (i = 0; i < H->count; i++)
-      (*(H->free)) (H->items[i].content);
+      H->free(H->items[i].content);
   free(H->items);
   free(H);
   return;
@@ -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
- * \param i	element position
+ * \param i  element position
  * \return the element at position i if ok, NULL otherwise
  *
- * Extracts from the heap and returns the element at position i. The head is automatically reorded.
+ * Extracts from the heap and returns the element at position i. The heap is automatically reorded.
  */
 void *xbt_heap_remove(xbt_heap_t H, int i)
 {
@@ -171,7 +171,7 @@ void *xbt_heap_remove(xbt_heap_t H, int i)
  */
 XBT_INLINE double xbt_heap_maxkey(xbt_heap_t H)
 {
-  xbt_assert0(H->count != 0, "Empty heap");
+  xbt_assert(H->count != 0, "Empty heap");
   return KEY(H, 0);
 }
 
@@ -184,7 +184,7 @@ XBT_INLINE double xbt_heap_maxkey(xbt_heap_t H)
  */
 void *xbt_heap_maxcontent(xbt_heap_t H)
 {
-  xbt_assert0(H->count != 0, "Empty heap");
+  xbt_assert(H->count != 0, "Empty heap");
   return CONTENT(H, 0);
 }