prioq: consider a NULL prioq empty

[elogind.git] / src / shared / prioq.c

diff --git a/src/shared/prioq.c b/src/shared/prioq.c
index b7d745990c4bcf78236ba44d6ad2495766d7a15d..64c44aef8266bfef9bab49ea12cb397f6cb777f7 100644 (file)
--- a/src/shared/prioq.c
+++ b/src/shared/prioq.c
@@ -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;
 }