X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fadt%2Fpqueue.c;h=0a7702ca3928931affedf9543c734fdb68483d14;hb=f82f9c6ffbe60d0c1988c7687b5bca29429a7c57;hp=1f9999b6b22ee794075d9528f1a04fd00acaa5fb;hpb=32ea6ea0320f551448bb66e534e3351977464d42;p=libfirm

diff --git a/ir/adt/pqueue.c b/ir/adt/pqueue.c
index 1f9999b6b..0a7702ca3 100644
--- a/ir/adt/pqueue.c
+++ b/ir/adt/pqueue.c
@@ -27,6 +27,7 @@
 
 #include "array.h"
 #include "pqueue.h"
+#include "error.h"
 
 /*
  * Implements a heap.
@@ -91,7 +92,7 @@ static void pqueue_heapify(pqueue_t *q, unsigned pos)
  */
 static void pqueue_sift_up(pqueue_t *q, unsigned pos)
 {
-	while(q->elems[pos].priority > q->elems[pos / 2].priority) {
+	while (q->elems[pos].priority > q->elems[pos / 2].priority) {
 		pqueue_el_t tmp;
 
 		tmp               = q->elems[pos];
@@ -129,15 +130,12 @@ void pqueue_put(pqueue_t *q, void *data, int priority)
 
 void *pqueue_pop_front(pqueue_t *q)
 {
-	switch(ARR_LEN(q->elems)) {
+	switch (ARR_LEN(q->elems)) {
 		case 0:
-			assert(0 && "Attempt to retrieve element from empty priority queue.");
-			return NULL;
-			break;
+			panic("Attempt to retrieve element from empty priority queue.");
 		case 1:
 			ARR_SHRINKLEN(q->elems, 0);
 			return q->elems[0].data;
-			break;
 		default: {
 			void *data = q->elems[0].data;
 			int  len   = ARR_LEN(q->elems) - 1;