X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fprio_heap%2Fprio_heap.c;h=97a69ac4b86293ee4b1d989948be23e5a45fd66c;hb=3fadfbc0c91f82c46bd36e6e0657ea93570c9db1;hp=43b4e8a4d509bbda62e2f696d9b8327ae6bf003c;hpb=71dd417a2b700c2315ef9919104572df1bc83f7a;p=babeltrace.git

diff --git a/lib/prio_heap/prio_heap.c b/lib/prio_heap/prio_heap.c
index 43b4e8a4..97a69ac4 100644
--- a/lib/prio_heap/prio_heap.c
+++ b/lib/prio_heap/prio_heap.c
@@ -1,6 +1,4 @@
 /*
- * prio_heap.c
- *
  * Static-sized priority heap containing pointers. Based on CLRS,
  * chapter 6.
  *
@@ -25,17 +23,12 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/prio_heap.h>
-#include <babeltrace/babeltrace-internal.h>
+#include <babeltrace2/prio-heap-internal.h>
+#include <babeltrace2/babeltrace-internal.h>
+#include <babeltrace2/assert-internal.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
-
-#ifndef max_t
-#define max_t(type, a, b)	\
-	((type) (a) > (type) (b) ? (type) (a) : (type) (b))
-#endif
 
 #ifdef DEBUG_HEAP
 void check_heap(const struct ptr_heap *heap)
@@ -46,7 +39,7 @@ void check_heap(const struct ptr_heap *heap)
 		return;
 
 	for (i = 1; i < heap->len; i++)
-		assert(!heap->gt(heap->ptrs[i], heap->ptrs[0]));
+		BT_ASSERT(!heap->gt(heap->ptrs[i], heap->ptrs[0]));
 }
 #endif
 
@@ -102,7 +95,7 @@ int heap_set_len(struct ptr_heap *heap, size_t new_len)
 	return 0;
 }
 
-int heap_init(struct ptr_heap *heap, size_t alloc_len,
+int bt_heap_init(struct ptr_heap *heap, size_t alloc_len,
 	      int gt(void *a, void *b))
 {
 	heap->ptrs = NULL;
@@ -111,12 +104,12 @@ int heap_init(struct ptr_heap *heap, size_t alloc_len,
 	heap->gt = gt;
 	/*
 	 * Minimum size allocated is 1 entry to ensure memory allocation
-	 * never fails within heap_replace_max.
+	 * never fails within bt_heap_replace_max.
 	 */
 	return heap_grow(heap, max_t(size_t, 1, alloc_len));
 }
 
-void heap_free(struct ptr_heap *heap)
+void bt_heap_free(struct ptr_heap *heap)
 {
 	free(heap->ptrs);
 }
@@ -147,7 +140,7 @@ static void heapify(struct ptr_heap *heap, size_t i)
 	check_heap(heap);
 }
 
-void *heap_replace_max(struct ptr_heap *heap, void *p)
+void *bt_heap_replace_max(struct ptr_heap *heap, void *p)
 {
 	void *res;
 
@@ -165,7 +158,7 @@ void *heap_replace_max(struct ptr_heap *heap, void *p)
 	return res;
 }
 
-int heap_insert(struct ptr_heap *heap, void *p)
+int bt_heap_insert(struct ptr_heap *heap, void *p)
 {
 	void **ptrs;
 	size_t pos;
@@ -186,7 +179,7 @@ int heap_insert(struct ptr_heap *heap, void *p)
 	return 0;
 }
 
-void *heap_remove(struct ptr_heap *heap)
+void *bt_heap_remove(struct ptr_heap *heap)
 {
 	switch (heap->len) {
 	case 0:
@@ -198,10 +191,10 @@ void *heap_remove(struct ptr_heap *heap)
 	/* Shrink, replace the current max by previous last entry and heapify */
 	heap_set_len(heap, heap->len - 1);
 	/* len changed. previous last entry is at heap->len */
-	return heap_replace_max(heap, heap->ptrs[heap->len]);
+	return bt_heap_replace_max(heap, heap->ptrs[heap->len]);
 }
 
-void *heap_cherrypick(struct ptr_heap *heap, void *p)
+void *bt_heap_cherrypick(struct ptr_heap *heap, void *p)
 {
 	size_t pos, len = heap->len;
 
@@ -223,11 +216,11 @@ found:
 	return p;
 }
 
-int heap_copy(struct ptr_heap *dst, struct ptr_heap *src)
+int bt_heap_copy(struct ptr_heap *dst, struct ptr_heap *src)
 {
 	int ret;
 
-	ret = heap_init(dst, src->alloc_len, src->gt);
+	ret = bt_heap_init(dst, src->alloc_len, src->gt);
 	if (ret < 0)
 		goto end;