tree-wide: use ASSERT_PTR more

[thirdparty/systemd.git] / src / shared / bus-wait-for-units.c

diff --git a/src/shared/bus-wait-for-units.c b/src/shared/bus-wait-for-units.c
index 78b2a604038c6bd94e77473d022c92f5c9758af4..0dd2a295dd9b122d17af8757d3d89a2cd9a17c72 100644 (file)
--- a/src/shared/bus-wait-for-units.c
+++ b/src/shared/bus-wait-for-units.c
@@ -1,6 +1,7 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "bus-util.h"
+#include "bus-error.h"
+#include "bus-map-properties.h"
 #include "bus-wait-for-units.h"
 #include "hashmap.h"
 #include "string-util.h"
@@ -80,6 +81,15 @@ static WaitForItem *wait_for_item_free(WaitForItem *item) {
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(WaitForItem*, wait_for_item_free);
 
+static void call_unit_callback_and_wait(BusWaitForUnits *d, WaitForItem *item, bool good) {
+        d->current = item;
+
+        if (item->unit_callback)
+                item->unit_callback(d, item->bus_path, good, item->userdata);
+
+        wait_for_item_free(item);
+}
+
 static void bus_wait_for_units_clear(BusWaitForUnits *d) {
         WaitForItem *item;
 
@@ -88,21 +98,16 @@ static void bus_wait_for_units_clear(BusWaitForUnits *d) {
         d->slot_disconnected = sd_bus_slot_unref(d->slot_disconnected);
         d->bus = sd_bus_unref(d->bus);
 
-        while ((item = hashmap_first(d->items))) {
-                d->current = item;
-
-                item->unit_callback(d, item->bus_path, false, item->userdata);
-                wait_for_item_free(item);
-        }
+        while ((item = hashmap_first(d->items)))
+                call_unit_callback_and_wait(d, item, false);
 
         d->items = hashmap_free(d->items);
 }
 
 static int match_disconnected(sd_bus_message *m, void *userdata, sd_bus_error *error) {
-        BusWaitForUnits *d = userdata;
+        BusWaitForUnits *d = ASSERT_PTR(userdata);
 
         assert(m);
-        assert(d);
 
         log_error("Warning! D-Bus connection terminated.");
 
@@ -212,13 +217,7 @@ static void wait_for_item_check_ready(WaitForItem *item) {
                         return;
         }
 
-        if (item->unit_callback) {
-                d->current = item;
-                item->unit_callback(d, item->bus_path, true, item->userdata);
-        }
-
-        wait_for_item_free(item);
-
+        call_unit_callback_and_wait(d, item, true);
         bus_wait_for_units_check_ready(d);
 }
 
@@ -229,13 +228,11 @@ static int property_map_job(
                 sd_bus_error *error,
                 void *userdata) {
 
-        WaitForItem *item = userdata;
+        WaitForItem *item = ASSERT_PTR(userdata);
         const char *path;
         uint32_t id;
         int r;
 
-        assert(item);
-
         r = sd_bus_message_read(m, "(uo)", &id, &path);
         if (r < 0)
                 return r;
@@ -267,12 +264,10 @@ static int wait_for_item_parse_properties(WaitForItem *item, sd_bus_message *m)
 }
 
 static int on_properties_changed(sd_bus_message *m, void *userdata, sd_bus_error *error) {
-        WaitForItem *item = userdata;
+        WaitForItem *item = ASSERT_PTR(userdata);
         const char *interface;
         int r;
 
-        assert(item);
-
         r = sd_bus_message_read(m, "s", &interface);
         if (r < 0) {
                 log_debug_errno(r, "Failed to parse PropertiesChanged signal: %m");
@@ -289,24 +284,22 @@ static int on_properties_changed(sd_bus_message *m, void *userdata, sd_bus_error
         return 0;
 }
 
-static int on_get_all_properties(sd_bus_message *m, void *userdata, sd_bus_error *error) {
-        WaitForItem *item = userdata;
+static int on_get_all_properties(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
+        WaitForItem *item = ASSERT_PTR(userdata);
+        const sd_bus_error *e;
         int r;
 
-        assert(item);
-
-        if (sd_bus_error_is_set(error)) {
+        e = sd_bus_message_get_error(m);
+        if (e) {
                 BusWaitForUnits *d = item->parent;
 
                 d->has_failed = true;
 
-                log_debug_errno(sd_bus_error_get_errno(error), "GetAll() failed for %s: %s",
-                                item->bus_path, error->message);
-
-                d->current = item;
-                item->unit_callback(d, item->bus_path, false, item->userdata);
-                wait_for_item_free(item);
+                r = sd_bus_error_get_errno(e);
+                log_debug_errno(r, "GetAll() failed for %s: %s",
+                                item->bus_path, bus_error_message(e, r));
 
+                call_unit_callback_and_wait(d, item, false);
                 bus_wait_for_units_check_ready(d);
                 return 0;
         }
@@ -418,7 +411,7 @@ int bus_wait_for_units_run(BusWaitForUnits *d) {
                 if (r > 0)
                         continue;
 
-                r = sd_bus_wait(d->bus, (uint64_t) -1);
+                r = sd_bus_wait(d->bus, UINT64_MAX);
                 if (r < 0)
                         return r;
         }