/* SPDX-License-Identifier: LGPL-2.1-or-later */
+#include "bus-error.h"
#include "bus-map-properties.h"
#include "bus-wait-for-units.h"
#include "hashmap.h"
}
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.");
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;
}
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");
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);
+ 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);
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;
}