From 9fdb1c63bbfcca3997a138709845d257e5fb0076 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 27 Jan 2025 09:24:16 +0900 Subject: [PATCH] core/dbus-manager: make output argument of transient_unit_from_message() optional --- src/core/dbus-manager.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c index 4b61002eac..b59f9dec76 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -971,7 +971,7 @@ static int transient_unit_from_message( Manager *m, sd_bus_message *message, const char *name, - Unit **unit, + Unit **ret_unit, sd_bus_error *error) { UnitType t; @@ -1022,7 +1022,8 @@ static int transient_unit_from_message( unit_add_to_load_queue(u); manager_dispatch_load_queue(m); - *unit = u; + if (ret_unit) + *ret_unit = u; return 0; } @@ -1042,14 +1043,13 @@ static int transient_aux_units_from_message( return r; while ((r = sd_bus_message_enter_container(message, 'r', "sa(sv)")) > 0) { - const char *name = NULL; - Unit *u; + const char *name; r = sd_bus_message_read(message, "s", &name); if (r < 0) return r; - r = transient_unit_from_message(m, message, name, &u, error); + r = transient_unit_from_message(m, message, name, /* unit = */ NULL, error); if (r < 0) return r;