kill an unused variable, fix a segfault after resizing the buffer while varsubsting...

[simgrid.git] / src / xbt / heap.c

diff --git a/src/xbt/heap.c b/src/xbt/heap.c
index 243e9c3..8423b0c 100644 (file)
--- a/src/xbt/heap.c
+++ b/src/xbt/heap.c
@@ -14,7 +14,7 @@
 #include <stdio.h>
 
 
-/** @addtogroup XBT_heap 
+/** @addtogroup XBT_heap
  *  \brief This section describes the API to generic heap with O(log(n)) access.
  */
 
@@ -71,21 +71,21 @@ int xbt_heap_size(xbt_heap_t H)
  */
 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;
 }
 
 /**
@@ -112,8 +112,8 @@ void *xbt_heap_pop(xbt_heap_t H)
   if (H->count < H->size / 4 && H->size > 16) {
     H->size = H->size / 2 + 1;
     H->items =
-       (void *) realloc(H->items,
-                        (H->size) * sizeof(struct xbt_heapItem));
+      (void *) realloc(H->items,
+                       (H->size) * sizeof(struct xbt_heapItem));
   }
   return max;
 }
@@ -145,7 +145,7 @@ void *xbt_heap_maxcontent(xbt_heap_t H)
 
 /* <<<< private >>>>
  * \param H the heap we're working on
- * 
+ *
  * Restores the heap property once an element has been deleted.
  */
 static void xbt_heap_maxHeapify(xbt_heap_t H)
@@ -173,7 +173,7 @@ static void xbt_heap_maxHeapify(xbt_heap_t H)
 /* <<<< private >>>>
  * \param H the heap we're working on
  * \param i an item position in the heap
- * 
+ *
  * Moves up an item at position i to its correct position. Works only
  * when called from xbt_heap_push. Do not use otherwise.
  */