chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hashmap.h: fix coding style issue
[elogind.git]
/
src
/
shared
/
prioq.c
diff --git
a/src/shared/prioq.c
b/src/shared/prioq.c
index b7d745990c4bcf78236ba44d6ad2495766d7a15d..a2205719b47bf6dc1dfc01ccf52ec02a1af6438d 100644
(file)
--- a/
src/shared/prioq.c
+++ b/
src/shared/prioq.c
@@
-159,7
+159,7
@@
int prioq_put(Prioq *q, void *data, unsigned *idx) {
unsigned n;
struct prioq_item *j;
unsigned n;
struct prioq_item *j;
- n = MAX((q->n_items+1) * 2, 16);
+ n = MAX((q->n_items+1) * 2, 16
u
);
j = realloc(q->items, sizeof(struct prioq_item) * n);
if (!j)
return -ENOMEM;
j = realloc(q->items, sizeof(struct prioq_item) * n);
if (!j)
return -ENOMEM;
@@
-236,7
+236,8
@@
static struct prioq_item* find_item(Prioq *q, void *data, unsigned *idx) {
int prioq_remove(Prioq *q, void *data, unsigned *idx) {
struct prioq_item *i;
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)
i = find_item(q, data, idx);
if (!i)
@@
-263,7
+264,9
@@
int prioq_reshuffle(Prioq *q, void *data, unsigned *idx) {
}
void *prioq_peek(Prioq *q) {
}
void *prioq_peek(Prioq *q) {
- assert(q);
+
+ if (!q)
+ return NULL;
if (q->n_items <= 0)
return NULL;
if (q->n_items <= 0)
return NULL;
@@
-274,7
+277,8
@@
void *prioq_peek(Prioq *q) {
void *prioq_pop(Prioq *q) {
void *data;
void *prioq_pop(Prioq *q) {
void *data;
- assert(q);
+ if (!q)
+ return NULL;
if (q->n_items <= 0)
return NULL;
if (q->n_items <= 0)
return NULL;
@@
-285,13
+289,17
@@
void *prioq_pop(Prioq *q) {
}
unsigned prioq_size(Prioq *q) {
}
unsigned prioq_size(Prioq *q) {
- assert(q);
+
+ if (!q)
+ return 0;
return q->n_items;
}
bool prioq_isempty(Prioq *q) {
return q->n_items;
}
bool prioq_isempty(Prioq *q) {
- assert(q);
+
+ if (!q)
+ return true;
return q->n_items <= 0;
}
return q->n_items <= 0;
}