From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 13 May 2024 13:05:49 +0000 (-0600)
Subject: machined: modernize method_create_or_register_machine() return parameter naming
X-Git-Tag: v257-rc1~1147^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4198ff4c6a2576a38bda527e69eedaf48f9722d1;p=thirdparty%2Fsystemd.git

machined: modernize method_create_or_register_machine() return parameter naming
---

diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
index 944b52efd4b..820ac3c58fe 100644
--- a/src/machine/machined-dbus.c
+++ b/src/machine/machined-dbus.c
@@ -218,7 +218,13 @@ static int method_list_machines(sd_bus_message *message, void *userdata, sd_bus_
         return sd_bus_send(NULL, reply, NULL);
 }
 
-static int method_create_or_register_machine(Manager *manager, sd_bus_message *message, bool read_network, Machine **_m, sd_bus_error *error) {
+static int method_create_or_register_machine(
+                Manager *manager,
+                sd_bus_message *message,
+                bool read_network,
+                Machine **ret,
+                sd_bus_error *error) {
+
         _cleanup_(pidref_done) PidRef pidref = PIDREF_NULL;
         const char *name, *service, *class, *root_directory;
         const int32_t *netif = NULL;
@@ -232,7 +238,7 @@ static int method_create_or_register_machine(Manager *manager, sd_bus_message *m
 
         assert(manager);
         assert(message);
-        assert(_m);
+        assert(ret);
 
         r = sd_bus_message_read(message, "s", &name);
         if (r < 0)
@@ -337,8 +343,7 @@ static int method_create_or_register_machine(Manager *manager, sd_bus_message *m
                 m->n_netif = n_netif;
         }
 
-        *_m = m;
-
+        *ret = m;
         return 1;
 
 fail: