From 4198ff4c6a2576a38bda527e69eedaf48f9722d1 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 13 May 2024 07:05:49 -0600 Subject: [PATCH] machined: modernize method_create_or_register_machine() return parameter naming --- src/machine/machined-dbus.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c index 944b52efd4..820ac3c58f 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: