-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
-#include "bus-util.h"
+#include "bus-map-properties.h"
#include "bus-wait-for-units.h"
#include "hashmap.h"
#include "string-util.h"
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;
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);
}
BusWaitForUnits *d;
assert(item);
- assert(d = item->parent);
+ assert_se(d = item->parent);
if (FLAGS_SET(item->flags, BUS_WAIT_FOR_MAINTENANCE_END)) {
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);
}
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);
-
+ call_unit_callback_and_wait(d, item, false);
bus_wait_for_units_check_ready(d);
return 0;
}
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;
}