merge-recursive: fix numerous argument alignment issues

diff --git a/prio-queue.c b/prio-queue.c
index fc3860fdcb9fc50d4d883e1a8638cca474cfb8d0..a07845187233e429e00138cce7ade42e97a40d4b 100644 (file)
--- a/prio-queue.c
+++ b/prio-queue.c
@@ -20,17 +20,16 @@ void prio_queue_reverse(struct prio_queue *queue)
        int i, j;
 
        if (queue->compare != NULL)
-               die("BUG: prio_queue_reverse() on non-LIFO queue");
+               BUG("prio_queue_reverse() on non-LIFO queue");
        for (i = 0; i < (j = (queue->nr - 1) - i); i++)
                swap(queue, i, j);
 }
 
 void clear_prio_queue(struct prio_queue *queue)
 {
-       free(queue->array);
+       FREE_AND_NULL(queue->array);
        queue->nr = 0;
        queue->alloc = 0;
-       queue->array = NULL;
        queue->insertion_ctr = 0;
 }