treewide: correct argument comments

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index cd13b705195f076a9b5af7805a4f1c483562fcca..b31e03c6eb5994741c7e4a665161dac7286cee31 100644 (file)
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -46,7 +46,7 @@ int cg_path_open(const char *controller, const char *path) {
         _cleanup_free_ char *fs = NULL;
         int r;
 
-        r = cg_get_path(controller, path, /* item=*/ NULL, &fs);
+        r = cg_get_path(controller, path, /* suffix=*/ NULL, &fs);
         if (r < 0)
                 return r;
 

diff --git a/src/boot/boot.c b/src/boot/boot.c
index 133f16acfe911a962d94f644e8f96f7009ce7cbd..c2851e126748ee423aeb9cd397937333dac2410d 100644 (file)
--- a/src/boot/boot.c
+++ b/src/boot/boot.c
@@ -1571,7 +1571,7 @@ static void config_load_type1_entries(
                                 /* offset= */ 0,
                                 /* size= */ 0,
                                 &content,
-                                /* ret_size= */ NULL);
+                                /* content_size= */ NULL);
                 if (err != EFI_SUCCESS)
                         continue;
 

diff --git a/src/boot/smbios.c b/src/boot/smbios.c
index 184aca14ce2debb1c1094783129f2df668afa5f7..0e2b8812ee501c12f469690085c3eca6945db35d 100644 (file)
--- a/src/boot/smbios.c
+++ b/src/boot/smbios.c
@@ -174,7 +174,7 @@ not_found:
 
 bool smbios_in_hypervisor(void) {
         /* Look up BIOS Information (Type 0). */
-        const SmbiosTableType0 *type0 = (const SmbiosTableType0 *) get_smbios_table(0, sizeof(SmbiosTableType0), /* left= */ NULL);
+        const SmbiosTableType0 *type0 = (const SmbiosTableType0 *) get_smbios_table(0, sizeof(SmbiosTableType0), /* ret_size_left= */ NULL);
         if (!type0)
                 return false;
 

diff --git a/src/bootctl/bootctl-status.c b/src/bootctl/bootctl-status.c
index 081f5d48f0f3b161380f5297dce575ff48485369..1804558bf7da7d0b8647cee4218f0ee517494f25 100644 (file)
--- a/src/bootctl/bootctl-status.c
+++ b/src/bootctl/bootctl-status.c
@@ -50,7 +50,7 @@ static int boot_config_load_and_select(
                 else if (r < 0)
                         log_warning_errno(r, "Failed to determine entries reported by boot loader, ignoring: %m");
                 else
-                        (void) boot_config_augment_from_loader(config, efi_entries, /* only_auto= */ false);
+                        (void) boot_config_augment_from_loader(config, efi_entries, /* auto_only= */ false);
         }
 
         return boot_config_select_special_entries(config, /* skip_efivars= */ !!arg_root);

diff --git a/src/fuzz/fuzz-varlink-idl.c b/src/fuzz/fuzz-varlink-idl.c
index 689cdf167bc1b6b7b671fea9913a28166b1b3db7..8981a363ec17421673ac1a7d507394c3ab35c523 100644 (file)
--- a/src/fuzz/fuzz-varlink-idl.c
+++ b/src/fuzz/fuzz-varlink-idl.c
@@ -25,7 +25,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
 
         assert_se(str = memdup_suffix0(data, size));
 
-        r = varlink_idl_parse(str, /* line= */ NULL, /* column= */ NULL, &vi);
+        r = varlink_idl_parse(str, /* ret_line= */ NULL, /* column= */ NULL, &vi);
         if (r < 0) {
                 log_debug_errno(r, "Failed to parse varlink interface definition: %m");
                 return 0;

diff --git a/src/libsystemd-network/sd-dhcp-server-lease.c b/src/libsystemd-network/sd-dhcp-server-lease.c
index 8b4c1012b5c4115948be28aa65283ff506a5927e..598ca2329fa6786ee80912ee5cf914df2bf0b6c7 100644 (file)
--- a/src/libsystemd-network/sd-dhcp-server-lease.c
+++ b/src/libsystemd-network/sd-dhcp-server-lease.c
@@ -467,7 +467,7 @@ static int load_leases_file(int dir_fd, const char *path, SavedInfo *ret) {
                         path,
                         /* flags = */ 0,
                         &v,
-                        /* ret_line = */ NULL,
+                        /* reterr_line = */ NULL,
                         /* ret_column = */ NULL);
         if (r < 0)
                 return r;

diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index e31165cfd47b3aa577886c7d4cd0c169daffdc24..19725aa21eb4170e3dbfe73d9f5b965d07eea579 100644 (file)
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -1300,7 +1300,7 @@ static int method_create_session(sd_bus_message *message, void *userdata, sd_bus
                         error,
                         uid,
                         leader_pid,
-                        /* pidfd = */ -EBADF,
+                        /* leader_pidfd = */ -EBADF,
                         service,
                         type,
                         class,
@@ -4423,7 +4423,7 @@ int match_job_removed(sd_bus_message *message, void *userdata, sd_bus_error *err
 
                                         LIST_FOREACH(sessions_by_user, s, user->sessions)
                                                 /* Don't propagate user service failures to the client */
-                                                session_jobs_reply(s, id, unit, /* error = */ NULL);
+                                                session_jobs_reply(s, id, unit, /* result = */ NULL);
 
                                         user_save(user);
                                         break;

diff --git a/src/nspawn/nspawn-network.c b/src/nspawn/nspawn-network.c
index cb0ebd3225b080aa5b7aabb51901614d44c0fc08..f29dfc0f5a33780ef6a829415660ad0cb5f80e67 100644 (file)
--- a/src/nspawn/nspawn-network.c
+++ b/src/nspawn/nspawn-network.c
@@ -497,7 +497,7 @@ static int netns_child_begin(int netns_fd, int *ret_original_netns_fd) {
 
         /* Populate new sysfs instance associated with the client netns, to make sd_device usable. */
         r = mount_nofollow_verbose(LOG_ERR, "sysfs", "/sys/", "sysfs",
-                                   MS_RDONLY|MS_NOSUID|MS_NOEXEC|MS_NODEV, /* opts = */ NULL);
+                                   MS_RDONLY|MS_NOSUID|MS_NOEXEC|MS_NODEV, /* options = */ NULL);
         if (r < 0)
                 return log_error_errno(r, "Failed to mount sysfs on /sys/: %m");
 

diff --git a/src/pcrlock/pcrlock.c b/src/pcrlock/pcrlock.c
index 85ba0314c100c5f77a498a09aa9eb67b04d45e3b..5dab5ba310197166e174d2eb7491ab809e0761eb 100644 (file)
--- a/src/pcrlock/pcrlock.c
+++ b/src/pcrlock/pcrlock.c
@@ -1671,7 +1671,7 @@ static int event_log_add_component_file(EventLog *el, EventLogComponent *compone
                         path,
                         /* flags= */ 0,
                         &j,
-                        /* ret_line= */ NULL,
+                        /* reterr_line= */ NULL,
                         /* ret_column= */ NULL);
         if (r < 0) {
                 log_warning_errno(r, "Failed to parse component file %s, ignoring: %m", path);
@@ -5320,7 +5320,7 @@ static int vl_method_make_policy(sd_varlink *link, sd_json_variant *parameters,
         if (r != 0)
                 return r;
 
-        r = make_policy(p.force, /* recovery_key= */ RECOVERY_PIN_HIDE);
+        r = make_policy(p.force, /* recovery_pin_mode= */ RECOVERY_PIN_HIDE);
         if (r < 0)
                 return r;
         if (r == 0)

diff --git a/src/ptyfwd/ptyfwd-tool.c b/src/ptyfwd/ptyfwd-tool.c
index a0ae7a2e2a6fc6935eae9dcbe529cc2a1d4c3554..62ef96a3ddd330f9e358dc8553330cc68d434549 100644 (file)
--- a/src/ptyfwd/ptyfwd-tool.c
+++ b/src/ptyfwd/ptyfwd-tool.c
@@ -171,7 +171,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return log_error_errno(r, "Failed to get event loop: %m");
 
-        pty_fd = openpt_allocate(O_RDWR|O_NOCTTY|O_NONBLOCK|O_CLOEXEC, /*ret_peer=*/ NULL);
+        pty_fd = openpt_allocate(O_RDWR|O_NOCTTY|O_NONBLOCK|O_CLOEXEC, /*ret_peer_path=*/ NULL);
         if (pty_fd < 0)
                 return log_error_errno(pty_fd, "Failed to acquire pseudo tty: %m");
 

diff --git a/src/resolve/test-resolved-packet.c b/src/resolve/test-resolved-packet.c
index af1332bb548fd9777e0eeaa86342ae8bf9278826..b11358a7d7d88fddc95febd84e3c34c5657faf57 100644 (file)
--- a/src/resolve/test-resolved-packet.c
+++ b/src/resolve/test-resolved-packet.c
@@ -209,7 +209,7 @@ TEST(naptr) {
         assert(streq(joined, twilio_reply_string));
 
         _cleanup_(sd_json_variant_unrefp) sd_json_variant *parsed = NULL;
-        assert_se(sd_json_parse(twilio_reply_json, /* flags= */ 0, &parsed, /* ret_line= */ NULL, /* ret_column= */ NULL) >= 0);
+        assert_se(sd_json_parse(twilio_reply_json, /* flags= */ 0, &parsed, /* reterr_line= */ NULL, /* ret_column= */ NULL) >= 0);
 
         assert_se(sd_json_variant_equal(parsed, a));
 }

diff --git a/src/shared/bootspec.c b/src/shared/bootspec.c
index 8b9411a5c2f1b201c58bcfbca94f0b186a09b51d..a22bc7062321b6ff5171837a97675b559cc30a9b 100644 (file)
--- a/src/shared/bootspec.c
+++ b/src/shared/bootspec.c
@@ -1007,7 +1007,7 @@ static int pe_find_uki_sections(
                 if (found->VirtualSize == 0)
                         continue;
 
-                r = pe_read_section_data(fd, found, PE_SECTION_SIZE_MAX, (void**) t->data, /* ret_data= */ NULL);
+                r = pe_read_section_data(fd, found, PE_SECTION_SIZE_MAX, (void**) t->data, /* ret_size= */ NULL);
                 if (r < 0)
                         return log_error_errno(r, "Failed to load contents of section '%s': %m", t->name);
         }

diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index 82153b1451d9dcadd77cedf0b3d03ed8f181f71d..c3b1a01c1a212e42ecfd643ae611589cfe94b97a 100644 (file)
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -917,7 +917,7 @@ int bus_get_instance_id(sd_bus *bus, sd_id128_t *ret) {
 
         r = sd_bus_call_method(bus,
                                "org.freedesktop.DBus", "/org/freedesktop/DBus", "org.freedesktop.DBus", "GetId",
-                               /* error = */ NULL, &reply,
+                               /* ret_error = */ NULL, &reply,
                                NULL);
         if (r < 0)
                 return r;

diff --git a/src/shared/creds-util.c b/src/shared/creds-util.c
index e72df30eb9e3ac582c0880e0620aecd0089fd187..6e0149e92e788aff8210ea1193498eb075a42b11 100644 (file)
--- a/src/shared/creds-util.c
+++ b/src/shared/creds-util.c
@@ -1358,7 +1358,7 @@ int decrypt_credential_and_warn(
                                 &IOVEC_MAKE(t->policy_hash_and_blob, le32toh(t->blob_size)),
                                 /* n_blobs= */ 1,
                                 &IOVEC_MAKE(t->policy_hash_and_blob + le32toh(t->blob_size), le32toh(t->policy_hash_size)),
-                                /* n_policy_hash= */ 1,
+                                /* n_known_policy_hash= */ 1,
                                 /* srk= */ NULL,
                                 &tpm2_key);
                 if (r == -EREMOTE)

diff --git a/src/shared/factory-reset.c b/src/shared/factory-reset.c
index 7cabb4b0091cb5b2a56d4c1fb20c27fc17613881..82f22d696f8f42e1e67ac63d8cbcbd4954b83444 100644 (file)
--- a/src/shared/factory-reset.c
+++ b/src/shared/factory-reset.c
@@ -40,7 +40,7 @@ static FactoryResetMode factory_reset_mode_efi_variable(void) {
                 return log_debug_errno(r, "Failed to get EFI variable FactoryResetRequest: %m");
 
         _cleanup_(sd_json_variant_unrefp) sd_json_variant *v = NULL;
-        r = sd_json_parse(req_str, /* flags= */ 0, &v, /* ret_line= */ NULL, /* ret_column= */ NULL);
+        r = sd_json_parse(req_str, /* flags= */ 0, &v, /* reterr_line= */ NULL, /* ret_column= */ NULL);
         if (r < 0) {
                 log_debug_errno(r, "EFI variable FactoryResetRequest set to invalid JSON, ignoring: %m");
                 return FACTORY_RESET_UNSPECIFIED;

diff --git a/src/vmspawn/vmspawn-util.c b/src/vmspawn/vmspawn-util.c
index 1216f3c5be0f3c586c03fac0af7fdfba2d5f0958..3f65fab2cc52bc4b0fee2bcc8cb4fd3defef235b 100644 (file)
--- a/src/vmspawn/vmspawn-util.c
+++ b/src/vmspawn/vmspawn-util.c
@@ -255,7 +255,7 @@ static int load_firmware_data(const char *path, FirmwareData **ret) {
                         path,
                         /* flags= */ 0,
                         &json,
-                        /* ret_line= */ NULL,
+                        /* reterr_line= */ NULL,
                         /* ret_column= */ NULL);
         if (r < 0)
                 return r;