From 93117b0fbd82f68e8d74056ab59247f31a50c46c Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Tue, 3 Jun 2025 10:49:17 +0200 Subject: [PATCH 01/10] cgroup-util: rename 'fsfd' -> 'cgroups_fd' Makes the header and implementation consistent. --- src/basic/cgroup-util.h | 2 +- src/nsresourced/userns-registry.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h index c5917296dd..2dea0ebdc4 100644 --- a/src/basic/cgroup-util.h +++ b/src/basic/cgroup-util.h @@ -135,7 +135,7 @@ typedef enum CGroupUnified { */ int cg_path_open(const char *controller, const char *path); -int cg_cgroupid_open(int fsfd, uint64_t id); +int cg_cgroupid_open(int cgroupfs_fd, uint64_t id); int cg_path_from_cgroupid(int cgroupfs_fd, uint64_t id, char **ret); int cg_get_cgroupid_at(int dfd, const char *path, uint64_t *ret); diff --git a/src/nsresourced/userns-registry.c b/src/nsresourced/userns-registry.c index 464bbee55a..8d31d16359 100644 --- a/src/nsresourced/userns-registry.c +++ b/src/nsresourced/userns-registry.c @@ -639,7 +639,7 @@ static int userns_destroy_cgroup(uint64_t cgroup_id) { _cleanup_close_ int cgroup_fd = -EBADF, parent_fd = -EBADF; int r; - cgroup_fd = cg_cgroupid_open(/* cgroupfsfd= */ -EBADF, cgroup_id); + cgroup_fd = cg_cgroupid_open(/* cgroupfs_fd= */ -EBADF, cgroup_id); if (cgroup_fd == -ESTALE) { log_debug_errno(cgroup_fd, "Control group %" PRIu64 " already gone, ignoring.", cgroup_id); return 0; From 946aeac9683c556e00206ce0b3705a30c3e546ed Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Tue, 3 Jun 2025 11:14:22 +0200 Subject: [PATCH 02/10] generator: rename 'password' -> 'key_file' Makes the header declaration and implementation consistent. --- src/shared/generator.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/generator.h b/src/shared/generator.h index 8a1f55cc90..8abf50f3ab 100644 --- a/src/shared/generator.h +++ b/src/shared/generator.h @@ -85,7 +85,7 @@ int generator_write_cryptsetup_service_section( FILE *f, const char *name, const char *what, - const char *password, + const char *key_file, const char *options); int generator_write_veritysetup_unit_section(FILE *f, const char *source); From ca6cac2b2d1b46cc29c9a58ecbf0614f88d2f47a Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Tue, 3 Jun 2025 13:40:39 +0200 Subject: [PATCH 03/10] homectl: rename 'emphasize_current' -> 'emphasize_current_password' Other functions in this file use the same parameter naming. --- src/home/homectl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/home/homectl.c b/src/home/homectl.c index f7420708bf..089bc2ac00 100644 --- a/src/home/homectl.c +++ b/src/home/homectl.c @@ -241,7 +241,7 @@ static int list_homes(int argc, char *argv[], void *userdata) { static int acquire_existing_password( const char *user_name, UserRecord *hr, - bool emphasize_current, + bool emphasize_current_password, AskPasswordFlags flags) { _cleanup_strv_free_erase_ char **password = NULL; @@ -271,7 +271,7 @@ static int acquire_existing_password( if (is_this_me(user_name) <= 0) SET_FLAG(flags, ASK_PASSWORD_ACCEPT_CACHED|ASK_PASSWORD_PUSH_CACHE, false); - if (asprintf(&question, emphasize_current ? + if (asprintf(&question, emphasize_current_password ? "Please enter current password for user %s:" : "Please enter password for user %s:", user_name) < 0) @@ -1453,7 +1453,7 @@ static int create_home_common(sd_json_variant *input, bool show_enforce_password r = acquire_existing_password( hr->user_name, hr, - /* emphasize_current= */ false, + /* emphasize_current_password= */ false, ASK_PASSWORD_ACCEPT_CACHED | ASK_PASSWORD_PUSH_CACHE); if (r < 0) return r; From edffcc84f2c9f4e487e48ff681c6185cf9e0e4e2 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Tue, 3 Jun 2025 14:01:13 +0200 Subject: [PATCH 04/10] sd-varlink: correct argument comment --- src/libsystemd/sd-varlink/sd-varlink-idl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsystemd/sd-varlink/sd-varlink-idl.c b/src/libsystemd/sd-varlink/sd-varlink-idl.c index c0afc8c4e7..7e6680e0e6 100644 --- a/src/libsystemd/sd-varlink/sd-varlink-idl.c +++ b/src/libsystemd/sd-varlink/sd-varlink-idl.c @@ -899,7 +899,7 @@ static int varlink_idl_subparse_field_type( } else { _cleanup_free_ char *token = NULL; - r = varlink_idl_subparse_token(p, line, column, /* valid_tokens= */ NULL, VALID_CHARS_IDENTIFIER, &token); + r = varlink_idl_subparse_token(p, line, column, /* allowed_delimiters= */ NULL, VALID_CHARS_IDENTIFIER, &token); if (r < 0) return r; if (!token) From 7a4eb66ee571a830ddc3b6b104326546f57c0425 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Tue, 3 Jun 2025 14:07:21 +0200 Subject: [PATCH 05/10] nsresourced: correct argument comments --- src/nsresourced/nsresourcework.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nsresourced/nsresourcework.c b/src/nsresourced/nsresourcework.c index ebace9e22f..f1c48a1e81 100644 --- a/src/nsresourced/nsresourcework.c +++ b/src/nsresourced/nsresourcework.c @@ -1248,7 +1248,7 @@ static int vl_method_add_mount_to_user_namespace(sd_varlink *link, sd_json_varia link, /* bus= */ NULL, "io.systemd.namespace-resource.delegate-mount", - /* polkit_details= */ NULL, + /* details= */ NULL, /* good_user= */ UID_INVALID, POLKIT_DEFAULT_ALLOW, /* If no polkit is installed, allow delegation of mounts to registered userns */ &c->polkit_registry); @@ -1401,7 +1401,7 @@ static int vl_method_add_cgroup_to_user_namespace(sd_varlink *link, sd_json_vari link, /* bus= */ NULL, "io.systemd.namespace-resource.delegate-cgroup", - /* polkit_details= */ NULL, + /* details= */ NULL, /* good_user= */ UID_INVALID, POLKIT_DEFAULT_ALLOW, /* If no polkit is installed, allow delegation of cgroups to registered userns */ &c->polkit_registry); From 2b58550bd4aa154d43372a280312ca249b82619e Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Tue, 3 Jun 2025 15:32:49 +0200 Subject: [PATCH 06/10] repart: correct argument comment --- src/repart/repart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/repart/repart.c b/src/repart/repart.c index 1b8d02ac1a..5fe195c033 100644 --- a/src/repart/repart.c +++ b/src/repart/repart.c @@ -4805,7 +4805,7 @@ static int partition_encrypt(Context *context, Partition *p, PartitionTarget *ta r = tpm2_calculate_sealing_policy( arg_tpm2_hash_pcr_values, arg_tpm2_n_hash_pcr_values, - /* pubkey= */ NULL, /* Turn this one off for the 2nd shard */ + /* public= */ NULL, /* Turn this one off for the 2nd shard */ /* use_pin= */ false, &pcrlock_policy, /* But turn this one on */ policy_hash + 1); From d7e986b7f0fe2b52dc633d917fb5983c6753372d Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Tue, 3 Jun 2025 15:37:30 +0200 Subject: [PATCH 07/10] ask-password-api: correct argument comment --- src/shared/ask-password-api.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c index 5709987ce4..33ed81fbb5 100644 --- a/src/shared/ask-password-api.c +++ b/src/shared/ask-password-api.c @@ -60,7 +60,7 @@ static int lookup_key(const char *keyname, key_serial_t *ret) { assert(keyname); assert(ret); - serial = request_key("user", keyname, /* callout_info= */ NULL, /* dest_keyring= */ 0); + serial = request_key("user", keyname, /* callout_info= */ NULL, /* destringid= */ 0); if (serial == -1) return negative_errno(); From 1cce9d930af168238b241d6aae283a3286343d93 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Tue, 3 Jun 2025 15:58:24 +0200 Subject: [PATCH 08/10] treewide: correct argument comment to 'ret' where applicable For functions with one return argument prefer 'ret' as argument comment. --- src/core/main.c | 2 +- src/gpt-auto-generator/gpt-auto-generator.c | 2 +- src/import/curl-util.c | 2 +- src/login/logind-dbus.c | 2 +- src/nsresourced/nsresourcework.c | 8 ++++---- src/nsresourced/userns-registry.c | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/core/main.c b/src/core/main.c index caff74cb34..d63814db1a 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 1f8d845c6f..029e99a303 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 82a1fc132a..4747d0993a 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 a6d0bb189b..e13b091128 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 f1c48a1e81..11a6df4116 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 8d31d16359..155b3c3f20 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) From 095031683f086bf78bed16879302ba96931669a1 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Wed, 4 Jun 2025 11:15:52 +0200 Subject: [PATCH 09/10] treewide: correct argument comments for sd_netlink_call --- src/libsystemd/sd-netlink/test-netlink.c | 2 +- src/nsresourced/userns-registry.c | 2 +- src/shared/socket-netlink.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libsystemd/sd-netlink/test-netlink.c b/src/libsystemd/sd-netlink/test-netlink.c index ae29b438df..cb11448e4c 100644 --- a/src/libsystemd/sd-netlink/test-netlink.c +++ b/src/libsystemd/sd-netlink/test-netlink.c @@ -723,7 +723,7 @@ TEST(sock_diag_unix) { ASSERT_OK(sd_sock_diag_message_new_unix(nl, &message, st.st_ino, cookie, UDIAG_SHOW_RQLEN)); _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *reply = NULL; - r = sd_netlink_call(nl, message, /* usec= */ 0, &reply); + r = sd_netlink_call(nl, message, /* timeout= */ 0, &reply); if (r == -ENOENT) return (void) log_tests_skipped("CONFIG_UNIX_DIAG disabled"); ASSERT_OK(r); diff --git a/src/nsresourced/userns-registry.c b/src/nsresourced/userns-registry.c index 155b3c3f20..6b40d713ff 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= */ NULL); + r = sd_netlink_call(*rtnl, m, /* timeout= */ 0, /* ret= */ NULL); if (ERRNO_IS_NEG_DEVICE_ABSENT(r)) /* Already gone? */ return 0; if (r < 0) diff --git a/src/shared/socket-netlink.c b/src/shared/socket-netlink.c index 79184bba3d..771bf2f799 100644 --- a/src/shared/socket-netlink.c +++ b/src/shared/socket-netlink.c @@ -510,7 +510,7 @@ int af_unix_get_qlen(int fd, uint32_t *ret) { return r; _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *reply = NULL; - r = sd_netlink_call(nl, message, /* usec= */ 0, &reply); + r = sd_netlink_call(nl, message, /* timeout= */ 0, &reply); if (r < 0) return r; From ac3a403486dce673a37fac4ef3b8ac995aedcbc6 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Wed, 4 Jun 2025 11:24:21 +0200 Subject: [PATCH 10/10] treewide: correct argument comments for sd_event_add_time --- src/nsresourced/nsresourced-manager.c | 2 +- src/resolve/resolved-dns-query.c | 2 +- src/userdb/userdbd-manager.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nsresourced/nsresourced-manager.c b/src/nsresourced/nsresourced-manager.c index de93cd33f9..6f59b9e5f7 100644 --- a/src/nsresourced/nsresourced-manager.c +++ b/src/nsresourced/nsresourced-manager.c @@ -279,7 +279,7 @@ static int start_workers(Manager *m, bool explicit_request) { &m->deferred_start_worker_event_source, CLOCK_MONOTONIC, ratelimit_end(&m->worker_ratelimit), - /* accuracy_usec= */ 0, + /* accuracy= */ 0, on_deferred_start_worker, m); if (r < 0) diff --git a/src/resolve/resolved-dns-query.c b/src/resolve/resolved-dns-query.c index da35656bcf..ea8236cec0 100644 --- a/src/resolve/resolved-dns-query.c +++ b/src/resolve/resolved-dns-query.c @@ -369,7 +369,7 @@ void dns_query_candidate_notify(DnsQueryCandidate *c) { c->query->manager->event, &c->timeout_event_source, CLOCK_BOOTTIME, - CANDIDATE_EXPEDITED_TIMEOUT_USEC, /* accuracy_usec= */ 0, + CANDIDATE_EXPEDITED_TIMEOUT_USEC, /* accuracy= */ 0, on_candidate_timeout, c, /* priority= */ 0, "candidate-timeout", /* force_reset= */ false); diff --git a/src/userdb/userdbd-manager.c b/src/userdb/userdbd-manager.c index 7815930f9b..b634abd4b5 100644 --- a/src/userdb/userdbd-manager.c +++ b/src/userdb/userdbd-manager.c @@ -247,7 +247,7 @@ static int start_workers(Manager *m, bool explicit_request) { &m->deferred_start_worker_event_source, CLOCK_MONOTONIC, ratelimit_end(&m->worker_ratelimit), - /* accuracy_usec= */ 0, + /* accuracy= */ 0, on_deferred_start_worker, m); if (r < 0)