From: Jelle van der Waa <jvanderwaa@redhat.com>
Date: Tue, 3 Jun 2025 13:58:24 +0000 (+0200)
Subject: treewide: correct argument comment to 'ret' where applicable
X-Git-Tag: v258-rc1~399^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1cce9d930af168238b241d6aae283a3286343d93;p=thirdparty%2Fsystemd.git

treewide: correct argument comment to 'ret' where applicable

For functions with one return argument prefer 'ret' as argument comment.
---

diff --git a/src/core/main.c b/src/core/main.c
index caff74cb34e..d63814db1a7 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -2461,7 +2461,7 @@ static int initialize_runtime(
                         (void) machine_id_setup(/* root = */ NULL, arg_machine_id,
                                                 (first_boot ? MACHINE_ID_SETUP_FORCE_TRANSIENT : 0) |
                                                 (arg_machine_id_from_firmware ? MACHINE_ID_SETUP_FORCE_FIRMWARE : 0),
-                                                /* ret_machine_id = */ NULL);
+                                                /* ret = */ NULL);
                         (void) hostname_setup(/* really = */ true);
                         (void) loopback_setup();
 
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index 1f8d845c6f5..029e99a3038 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -816,7 +816,7 @@ static int add_root_mount(void) {
                         return 0;
                 }
 
-                r = efi_loader_get_device_part_uuid(/* ret_uuid= */ NULL);
+                r = efi_loader_get_device_part_uuid(/* ret= */ NULL);
                 if (r == -ENOENT) {
                         log_notice("EFI loader partition unknown, not processing %s.\n"
                                    "(The boot loader did not set EFI variable LoaderDevicePartUUID.)",
diff --git a/src/import/curl-util.c b/src/import/curl-util.c
index 82a1fc132ac..4747d0993a8 100644
--- a/src/import/curl-util.c
+++ b/src/import/curl-util.c
@@ -17,7 +17,7 @@ static void curl_glue_check_finished(CurlGlue *g) {
         assert(g);
 
         /* sd_event_get_exit_code() returns -ENODATA if no exit was scheduled yet */
-        r = sd_event_get_exit_code(g->event, /* ret_code= */ NULL);
+        r = sd_event_get_exit_code(g->event, /* ret= */ NULL);
         if (r >= 0)
                 return; /* exit scheduled? Then don't process this anymore */
         if (r != -ENODATA)
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index a6d0bb189be..e13b0911282 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -935,7 +935,7 @@ int manager_create_session(
         }
 
         /* Check if we are already in a logind session, and if so refuse. */
-        r = manager_get_session_by_pidref(m, leader, /* ret_session= */ NULL);
+        r = manager_get_session_by_pidref(m, leader, /* ret= */ NULL);
         if (r < 0)
                 return log_debug_errno(
                                 r,
diff --git a/src/nsresourced/nsresourcework.c b/src/nsresourced/nsresourcework.c
index f1c48a1e810..11a6df41168 100644
--- a/src/nsresourced/nsresourcework.c
+++ b/src/nsresourced/nsresourcework.c
@@ -379,13 +379,13 @@ static int uid_is_available(
         if (r > 0)
                 return false;
 
-        r = userdb_by_uid(candidate, /* match= */ NULL, USERDB_AVOID_MULTIPLEXER, /* ret_record= */ NULL);
+        r = userdb_by_uid(candidate, /* match= */ NULL, USERDB_AVOID_MULTIPLEXER, /* ret= */ NULL);
         if (r >= 0)
                 return false;
         if (r != -ESRCH)
                 return r;
 
-        r = groupdb_by_gid(candidate, /* match= */ NULL, USERDB_AVOID_MULTIPLEXER, /* ret_record= */ NULL);
+        r = groupdb_by_gid(candidate, /* match= */ NULL, USERDB_AVOID_MULTIPLEXER, /* ret= */ NULL);
         if (r >= 0)
                 return false;
         if (r != -ESRCH)
@@ -416,13 +416,13 @@ static int name_is_available(
         if (!user_name)
                 return -ENOMEM;
 
-        r = userdb_by_name(user_name, /* match= */ NULL, USERDB_AVOID_MULTIPLEXER, /* ret_record= */ NULL);
+        r = userdb_by_name(user_name, /* match= */ NULL, USERDB_AVOID_MULTIPLEXER, /* ret= */ NULL);
         if (r >= 0)
                 return false;
         if (r != -ESRCH)
                 return r;
 
-        r = groupdb_by_name(user_name, /* match= */ NULL, USERDB_AVOID_MULTIPLEXER, /* ret_record= */ NULL);
+        r = groupdb_by_name(user_name, /* match= */ NULL, USERDB_AVOID_MULTIPLEXER, /* ret= */ NULL);
         if (r >= 0)
                 return false;
         if (r != -ESRCH)
diff --git a/src/nsresourced/userns-registry.c b/src/nsresourced/userns-registry.c
index 8d31d163591..155b3c3f20a 100644
--- a/src/nsresourced/userns-registry.c
+++ b/src/nsresourced/userns-registry.c
@@ -738,7 +738,7 @@ static int userns_destroy_netif(sd_netlink **rtnl, const char *name) {
         if (r < 0)
                 return r;
 
-        r = sd_netlink_call(*rtnl, m, /* timeout_usec= */ 0, /* ret_reply= */ NULL);
+        r = sd_netlink_call(*rtnl, m, /* timeout_usec= */ 0, /* ret= */ NULL);
         if (ERRNO_IS_NEG_DEVICE_ABSENT(r)) /* Already gone? */
                 return 0;
         if (r < 0)