From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 27 Jan 2025 00:24:16 +0000 (+0900)
Subject: core/dbus-manager: make output argument of transient_unit_from_message() optional
X-Git-Tag: v258-rc1~1474
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fdb1c63bbfcca3997a138709845d257e5fb0076;p=thirdparty%2Fsystemd.git

core/dbus-manager: make output argument of transient_unit_from_message() optional
---

diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index 4b61002eac8..b59f9dec76e 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;