projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
typo
[libfirm]
/
ir
/
adt
/
pqueue.c
diff --git
a/ir/adt/pqueue.c
b/ir/adt/pqueue.c
index
0a7702c
..
3e28ace
100644
(file)
--- a/
ir/adt/pqueue.c
+++ b/
ir/adt/pqueue.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 1995-20
08
University of Karlsruhe. All right reserved.
+ * Copyright (C) 1995-20
11
University of Karlsruhe. All right reserved.
*
* This file is part of libFirm.
*
*
* This file is part of libFirm.
*
@@
-46,12
+46,12
@@
*
*/
*
*/
-typedef struct
_
pqueue_el_t {
+typedef struct pqueue_el_t {
void *data;
int priority;
} pqueue_el_t;
void *data;
int priority;
} pqueue_el_t;
-struct
_
pqueue_t {
+struct pqueue_t {
pqueue_el_t *elems;
};
pqueue_el_t *elems;
};
@@
-59,13
+59,13
@@
struct _pqueue_t {
* Enforces the heap characteristics if the queue
* starting from element at position @p pos.
*/
* Enforces the heap characteristics if the queue
* starting from element at position @p pos.
*/
-static void pqueue_heapify(pqueue_t *q,
unsigned
pos)
+static void pqueue_heapify(pqueue_t *q,
size_t
pos)
{
{
-
unsigned
len = ARR_LEN(q->elems);
+
size_t
len = ARR_LEN(q->elems);
while (pos * 2 < len) {
pqueue_el_t tmp;
while (pos * 2 < len) {
pqueue_el_t tmp;
-
unsigned
exchange = pos;
+
size_t
exchange = pos;
if (q->elems[exchange].priority < q->elems[pos * 2].priority) {
exchange = pos * 2;
if (q->elems[exchange].priority < q->elems[pos * 2].priority) {
exchange = pos * 2;
@@
-90,7
+90,7
@@
static void pqueue_heapify(pqueue_t *q, unsigned pos)
/**
* Sifts up a newly inserted element at position @p pos.
*/
/**
* Sifts up a newly inserted element at position @p pos.
*/
-static void pqueue_sift_up(pqueue_t *q,
unsigned
pos)
+static void pqueue_sift_up(pqueue_t *q,
size_t
pos)
{
while (q->elems[pos].priority > q->elems[pos / 2].priority) {
pqueue_el_t tmp;
{
while (q->elems[pos].priority > q->elems[pos / 2].priority) {
pqueue_el_t tmp;
@@
-137,8
+137,8
@@
void *pqueue_pop_front(pqueue_t *q)
ARR_SHRINKLEN(q->elems, 0);
return q->elems[0].data;
default: {
ARR_SHRINKLEN(q->elems, 0);
return q->elems[0].data;
default: {
- void *data = q->elems[0].data;
-
int
len = ARR_LEN(q->elems) - 1;
+ void
*data = q->elems[0].data;
+
size_t
len = ARR_LEN(q->elems) - 1;
q->elems[0] = q->elems[len];
ARR_SHRINKLEN(q->elems, len);
q->elems[0] = q->elems[len];
ARR_SHRINKLEN(q->elems, len);
@@
-149,7
+149,7
@@
void *pqueue_pop_front(pqueue_t *q)
}
}
}
}
-
in
t pqueue_length(const pqueue_t *q)
+
size_
t pqueue_length(const pqueue_t *q)
{
return ARR_LEN(q->elems);
}
{
return ARR_LEN(q->elems);
}