unsigned n;
struct prioq_item *j;
- n = MAX((q->n_items+1) * 2, 16);
+ n = MAX((q->n_items+1) * 2, 16u);
j = realloc(q->items, sizeof(struct prioq_item) * n);
if (!j)
return -ENOMEM;
}
}
-static struct prioq_item* find_item(Prioq *q, void *data, unsigned *idx) {
+_pure_ static struct prioq_item* find_item(Prioq *q, void *data, unsigned *idx) {
struct prioq_item *i;
assert(q);
if (idx) {
- if (*idx > q->n_items)
+ if (*idx == PRIOQ_IDX_NULL ||
+ *idx > q->n_items)
return NULL;
i = q->items + *idx;
int prioq_remove(Prioq *q, void *data, unsigned *idx) {
struct prioq_item *i;
- assert(q);
+ if (!q)
+ return 0;
i = find_item(q, data, idx);
if (!i)
}
void *prioq_peek(Prioq *q) {
- assert(q);
+
+ if (!q)
+ return NULL;
if (q->n_items <= 0)
return NULL;
void *prioq_pop(Prioq *q) {
void *data;
- assert(q);
+ if (!q)
+ return NULL;
if (q->n_items <= 0)
return NULL;
}
unsigned prioq_size(Prioq *q) {
- assert(q);
- return q->n_items;
+ if (!q)
+ return 0;
+ return q->n_items;
}
+
bool prioq_isempty(Prioq *q) {
- assert(q);
+
+ if (!q)
+ return true;
return q->n_items <= 0;
}