#include "xbt/log.h"
#include "heap_private.h"
+#include <stdio.h>
+
/** @addtogroup XBT_heap
* \brief This section describes the API to generic heap with O(log(n)) access.
*
* Creates a new heap.
*/
-xbt_heap_t xbt_heap_new(int init_size, void_f_pvoid_t * const free_func)
+xbt_heap_t xbt_heap_new(int init_size, void_f_pvoid_t const free_func)
{
xbt_heap_t H = xbt_new0(struct xbt_heap, 1);
H->size = init_size;
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;
*/
void xbt_heap_push(xbt_heap_t H, void *content, double key)
{
- int count = ++(H->count);
- int size = H->size;
- xbt_heapItem_t item;
- if (count > size) {
- H->size = 2 * size + 1;
- H->items =
- (void *) realloc(H->items,
- (H->size) * sizeof(struct xbt_heapItem));
- }
- item = &(H->items[count - 1]);
- item->key = key;
- item->content = content;
- xbt_heap_increaseKey(H, count - 1);
- return;
+ int count = ++(H->count);
+
+ int size = H->size;
+ xbt_heapItem_t item;
+
+ if (count > size) {
+ H->size = 2 * size + 1;
+ H->items =(void *) realloc(H->items,(H->size) * sizeof(struct xbt_heapItem));
+ }
+
+ item = &(H->items[count - 1]);
+ item->key = key;
+ item->content = content;
+ xbt_heap_increaseKey(H, count - 1);
+ return;
}
/**