From e3017af97310da024ffb378ed155bc1676922ce7 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 21 Mar 2013 22:50:25 +0100
Subject: bus: implement full method call timeout logic

---
 src/shared/prioq.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

(limited to 'src/shared/prioq.c')

diff --git a/src/shared/prioq.c b/src/shared/prioq.c
index fe91324d9b..b7d745990c 100644
--- a/src/shared/prioq.c
+++ b/src/shared/prioq.c
@@ -53,6 +53,19 @@ void prioq_free(Prioq *q) {
         free(q);
 }
 
+int prioq_ensure_allocated(Prioq **q, compare_func_t compare_func) {
+        assert(q);
+
+        if (*q)
+                return 0;
+
+        *q = prioq_new(compare_func);
+        if (!*q)
+                return -ENOMEM;
+
+        return 0;
+}
+
 static void swap(Prioq *q, unsigned j, unsigned k) {
         void *saved_data;
         unsigned *saved_idx;
@@ -204,9 +217,12 @@ static struct prioq_item* find_item(Prioq *q, void *data, unsigned *idx) {
         assert(q);
 
         if (idx) {
-                assert(*idx < q->n_items);
+                if (*idx > q->n_items)
+                        return NULL;
+
                 i = q->items + *idx;
-                assert(i->data == data);
+                if (i->data != data)
+                        return NULL;
 
                 return i;
         } else {
-- 
cgit v1.2.3-54-g00ecf