From f54b0adec9759b55ec2aa9072cd8dbd9858bd549 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Wed, 21 May 2025 19:23:20 +0200 Subject: [PATCH 01/13] fuzz: correct argument comment --- src/fuzz/fuzz-varlink-idl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fuzz/fuzz-varlink-idl.c b/src/fuzz/fuzz-varlink-idl.c index f2b73f622a..bc42586e17 100644 --- a/src/fuzz/fuzz-varlink-idl.c +++ b/src/fuzz/fuzz-varlink-idl.c @@ -19,7 +19,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { assert_se(str = memdup_suffix0(data, size)); - r = sd_varlink_idl_parse(str, /* ret_line= */ NULL, /* column= */ NULL, &vi); + r = sd_varlink_idl_parse(str, /* reterr_line= */ NULL, /* reterr_column= */ NULL, &vi); if (r < 0) { log_debug_errno(r, "Failed to parse varlink interface definition: %m"); return 0; From 62179354229f9bc15741fb843461b64680576079 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Wed, 21 May 2025 19:28:58 +0200 Subject: [PATCH 02/13] sd-bus: prefix return arguments with 'ret_' for sd_bus_message_peek_type --- src/libsystemd/sd-bus/bus-message.c | 42 ++++++++++++++--------------- src/systemd/sd-bus.h | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c index 15aa16a788..8eff8781ab 100644 --- a/src/libsystemd/sd-bus/bus-message.c +++ b/src/libsystemd/sd-bus/bus-message.c @@ -3180,7 +3180,7 @@ static void message_quit_container(sd_bus_message *m) { c->index = c->saved_index; } -_public_ int sd_bus_message_peek_type(sd_bus_message *m, char *type, const char **contents) { +_public_ int sd_bus_message_peek_type(sd_bus_message *m, char *ret_type, const char **ret_contents) { struct bus_container *c; int r; @@ -3196,16 +3196,16 @@ _public_ int sd_bus_message_peek_type(sd_bus_message *m, char *type, const char c = message_get_last_container(m); if (bus_type_is_basic(c->signature[c->index])) { - if (contents) - *contents = NULL; - if (type) - *type = c->signature[c->index]; + if (ret_contents) + *ret_contents = NULL; + if (ret_type) + *ret_type = c->signature[c->index]; return 1; } if (c->signature[c->index] == SD_BUS_TYPE_ARRAY) { - if (contents) { + if (ret_contents) { size_t l; r = signature_element_length(c->signature+c->index+1, &l); @@ -3220,18 +3220,18 @@ _public_ int sd_bus_message_peek_type(sd_bus_message *m, char *type, const char c->signature + c->index + 1, l) < 0) return -ENOMEM; - *contents = c->peeked_signature; + *ret_contents = c->peeked_signature; } - if (type) - *type = SD_BUS_TYPE_ARRAY; + if (ret_type) + *ret_type = SD_BUS_TYPE_ARRAY; return 1; } if (IN_SET(c->signature[c->index], SD_BUS_TYPE_STRUCT_BEGIN, SD_BUS_TYPE_DICT_ENTRY_BEGIN)) { - if (contents) { + if (ret_contents) { size_t l; r = signature_element_length(c->signature+c->index, &l); @@ -3243,17 +3243,17 @@ _public_ int sd_bus_message_peek_type(sd_bus_message *m, char *type, const char c->signature + c->index + 1, l - 2) < 0) return -ENOMEM; - *contents = c->peeked_signature; + *ret_contents = c->peeked_signature; } - if (type) - *type = c->signature[c->index] == SD_BUS_TYPE_STRUCT_BEGIN ? SD_BUS_TYPE_STRUCT : SD_BUS_TYPE_DICT_ENTRY; + if (ret_type) + *ret_type = c->signature[c->index] == SD_BUS_TYPE_STRUCT_BEGIN ? SD_BUS_TYPE_STRUCT : SD_BUS_TYPE_DICT_ENTRY; return 1; } if (c->signature[c->index] == SD_BUS_TYPE_VARIANT) { - if (contents) { + if (ret_contents) { size_t rindex, l; void *q; @@ -3274,11 +3274,11 @@ _public_ int sd_bus_message_peek_type(sd_bus_message *m, char *type, const char if (!validate_signature(q, l)) return -EBADMSG; - *contents = q; + *ret_contents = q; } - if (type) - *type = SD_BUS_TYPE_VARIANT; + if (ret_type) + *ret_type = SD_BUS_TYPE_VARIANT; return 1; } @@ -3286,10 +3286,10 @@ _public_ int sd_bus_message_peek_type(sd_bus_message *m, char *type, const char return -EINVAL; eof: - if (type) - *type = 0; - if (contents) - *contents = NULL; + if (ret_type) + *ret_type = 0; + if (ret_contents) + *ret_contents = NULL; return 0; } diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h index a530033055..ad6b36d54c 100644 --- a/src/systemd/sd-bus.h +++ b/src/systemd/sd-bus.h @@ -251,7 +251,7 @@ int sd_bus_message_read_strv_extend(sd_bus_message *m, char ***l); int sd_bus_message_skip(sd_bus_message *m, const char *types); int sd_bus_message_enter_container(sd_bus_message *m, char type, const char *contents); int sd_bus_message_exit_container(sd_bus_message *m); -int sd_bus_message_peek_type(sd_bus_message *m, char *type, const char **contents); +int sd_bus_message_peek_type(sd_bus_message *m, char *ret_type, const char **ret_contents); int sd_bus_message_verify_type(sd_bus_message *m, char type, const char *contents); int sd_bus_message_at_end(sd_bus_message *m, int complete); int sd_bus_message_rewind(sd_bus_message *m, int complete); From 3f0a9665d9c1f9bda0823c772d025d45e63df3d1 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Wed, 21 May 2025 19:52:11 +0200 Subject: [PATCH 03/13] dissect-image: rename 'dest' -> 'where' Consistently name dissect_image_mount*. --- src/shared/dissect-image.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/dissect-image.h b/src/shared/dissect-image.h index 2343b6b46d..226b6f6428 100644 --- a/src/shared/dissect-image.h +++ b/src/shared/dissect-image.h @@ -172,7 +172,7 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(DissectedImage*, dissected_image_unref); int dissected_image_decrypt(DissectedImage *m, const char *passphrase, const VeritySettings *verity, DissectImageFlags flags); int dissected_image_decrypt_interactively(DissectedImage *m, const char *passphrase, const VeritySettings *verity, DissectImageFlags flags); -int dissected_image_mount(DissectedImage *m, const char *dest, uid_t uid_shift, uid_t uid_range, int userns_fd, DissectImageFlags flags); +int dissected_image_mount(DissectedImage *m, const char *where, uid_t uid_shift, uid_t uid_range, int userns_fd, DissectImageFlags flags); int dissected_image_mount_and_warn(DissectedImage *m, const char *where, uid_t uid_shift, uid_t uid_range, int userns_fd, DissectImageFlags flags); int dissected_image_acquire_metadata(DissectedImage *m, int userns_fd, DissectImageFlags extra_flags); From 457ce7d94a0b33c1223246dc40de4454be5971c0 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Wed, 21 May 2025 20:02:32 +0200 Subject: [PATCH 04/13] machine-id-setup: correct argument comments --- src/shared/machine-id-setup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/shared/machine-id-setup.c b/src/shared/machine-id-setup.c index b6c6751089..d4f12e4179 100644 --- a/src/shared/machine-id-setup.c +++ b/src/shared/machine-id-setup.c @@ -267,7 +267,7 @@ int machine_id_setup(const char *root, sd_id128_t machine_id, MachineIdSetupFlag unlink_run_machine_id = true; } else { - r = chase("/run/machine-id", root, CHASE_PREFIX_ROOT|CHASE_MUST_BE_REGULAR, &run_machine_id, /* ret_inode_fd= */ NULL); + r = chase("/run/machine-id", root, CHASE_PREFIX_ROOT|CHASE_MUST_BE_REGULAR, &run_machine_id, /* ret_fd= */ NULL); if (r < 0) return log_error_errno(r, "Failed to open '/run/machine-id': %m"); } @@ -283,7 +283,7 @@ int machine_id_setup(const char *root, sd_id128_t machine_id, MachineIdSetupFlag log_full(FLAGS_SET(flags, MACHINE_ID_SETUP_FORCE_TRANSIENT) ? LOG_DEBUG : LOG_INFO, "Installed transient '%s' file.", etc_machine_id); /* Mark the mount read-only (note: we are not going via FORMAT_PROC_FD_PATH() here because that fd is not updated to our new bind mount) */ - (void) mount_follow_verbose(LOG_WARNING, /* source= */ NULL, etc_machine_id, /* fstype= */ NULL, MS_BIND|MS_RDONLY|MS_REMOUNT, /* options= */ NULL); + (void) mount_follow_verbose(LOG_WARNING, /* what= */ NULL, etc_machine_id, /* fstype= */ NULL, MS_BIND|MS_RDONLY|MS_REMOUNT, /* options= */ NULL); finish: if (!in_initrd()) @@ -394,7 +394,7 @@ int machine_id_commit(const char *root) { "Failed to switch back to initial mount namespace: %m.\n" "We'll keep transient %s file until next reboot.", etc_machine_id); - r = umountat_detach_verbose(LOG_DEBUG, fd, /* filename= */ NULL); + r = umountat_detach_verbose(LOG_DEBUG, fd, /* where= */ NULL); if (r < 0) return log_warning_errno(r, "Failed to unmount transient %s file: %m.\n" From 684cd01f0e60d5737ec8213b5e933dfe5844035b Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Wed, 21 May 2025 20:04:55 +0200 Subject: [PATCH 05/13] cgroup-util: rename 's' -> 'killed_pids' --- src/basic/cgroup-util.c | 24 ++++++++++++------------ src/basic/cgroup-util.h | 4 ++-- src/core/unit.c | 2 +- src/udev/udev-manager.c | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c index e11a6a3e49..f0b91254dc 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -292,7 +292,7 @@ int cg_kill( const char *path, int sig, CGroupFlags flags, - Set *s, + Set *killed_pids, cg_kill_log_func_t log_kill, void *userdata) { @@ -312,9 +312,9 @@ int cg_kill( * * When sending SIGKILL, prefer cg_kill_kernel_sigkill(), which is fully atomic. */ - if (!s) { - s = allocated_set = set_new(NULL); - if (!s) + if (!killed_pids) { + killed_pids = allocated_set = set_new(NULL); + if (!killed_pids) return -ENOMEM; } @@ -343,7 +343,7 @@ int cg_kill( if ((flags & CGROUP_IGNORE_SELF) && pidref_is_self(&pidref)) continue; - if (set_contains(s, PID_TO_PTR(pidref.pid))) + if (set_contains(killed_pids, PID_TO_PTR(pidref.pid))) continue; /* Ignore kernel threads to mimic the behavior of cgroup.kill. */ @@ -373,7 +373,7 @@ int cg_kill( done = false; - r = set_put(s, PID_TO_PTR(pidref.pid)); + r = set_put(killed_pids, PID_TO_PTR(pidref.pid)); if (r < 0) return RET_GATHER(ret, r); } @@ -390,7 +390,7 @@ int cg_kill_recursive( const char *path, int sig, CGroupFlags flags, - Set *s, + Set *killed_pids, cg_kill_log_func_t log_kill, void *userdata) { @@ -401,13 +401,13 @@ int cg_kill_recursive( assert(path); assert(sig >= 0); - if (!s) { - s = allocated_set = set_new(NULL); - if (!s) + if (!killed_pids) { + killed_pids = allocated_set = set_new(NULL); + if (!killed_pids) return -ENOMEM; } - ret = cg_kill(path, sig, flags, s, log_kill, userdata); + ret = cg_kill(path, sig, flags, killed_pids, log_kill, userdata); r = cg_enumerate_subgroups(SYSTEMD_CGROUP_CONTROLLER, path, &d); if (r < 0) { @@ -432,7 +432,7 @@ int cg_kill_recursive( if (!p) return -ENOMEM; - r = cg_kill_recursive(p, sig, flags, s, log_kill, userdata); + r = cg_kill_recursive(p, sig, flags, killed_pids, log_kill, userdata); if (r < 0) log_debug_errno(r, "Failed to recursively kill processes in cgroup '%s': %m", p); if (r != 0 && ret >= 0) diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h index 42c03e54b7..9e69bf6c98 100644 --- a/src/basic/cgroup-util.h +++ b/src/basic/cgroup-util.h @@ -206,9 +206,9 @@ int cg_read_subgroup(DIR *d, char **ret); typedef int (*cg_kill_log_func_t)(const PidRef *pid, int sig, void *userdata); -int cg_kill(const char *path, int sig, CGroupFlags flags, Set *s, cg_kill_log_func_t kill_log, void *userdata); +int cg_kill(const char *path, int sig, CGroupFlags flags, Set *killed_pids, cg_kill_log_func_t kill_log, void *userdata); int cg_kill_kernel_sigkill(const char *path); -int cg_kill_recursive(const char *path, int sig, CGroupFlags flags, Set *s, cg_kill_log_func_t kill_log, void *userdata); +int cg_kill_recursive(const char *path, int sig, CGroupFlags flags, Set *killed_pids, cg_kill_log_func_t kill_log, void *userdata); int cg_split_spec(const char *spec, char **ret_controller, char **ret_path); int cg_mangle_path(const char *path, char **ret); diff --git a/src/core/unit.c b/src/core/unit.c index bb30d704cf..5cbd0fb76c 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -6008,7 +6008,7 @@ int unit_warn_leftover_processes(Unit *u, bool start) { crt->cgroup_path, /* sig= */ 0, /* flags= */ 0, - /* set= */ NULL, + /* killed_pids= */ NULL, start ? unit_log_leftover_process_start : unit_log_leftover_process_stop, u); } diff --git a/src/udev/udev-manager.c b/src/udev/udev-manager.c index f92a186dd4..5601192745 100644 --- a/src/udev/udev-manager.c +++ b/src/udev/udev-manager.c @@ -1321,7 +1321,7 @@ static int on_post(sd_event_source *s, void *userdata) { if (manager->cgroup && set_isempty(manager->synthesize_change_child_event_sources)) /* cleanup possible left-over processes in our cgroup */ - (void) cg_kill(manager->cgroup, SIGKILL, CGROUP_IGNORE_SELF, /* set=*/ NULL, /* kill_log= */ NULL, /* userdata= */ NULL); + (void) cg_kill(manager->cgroup, SIGKILL, CGROUP_IGNORE_SELF, /* killed_pids=*/ NULL, /* kill_log= */ NULL, /* userdata= */ NULL); return 0; } From 3ce64b0fbe371e942b9ba0b7a4fca95143b6e05f Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Sat, 24 May 2025 17:06:04 +0200 Subject: [PATCH 06/13] cgroup-util: rename 'kill_log' -> 'log_kill' Rename according to the implementation. --- src/basic/cgroup-util.h | 4 ++-- src/core/unit.c | 2 +- src/udev/udev-manager.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h index 9e69bf6c98..05211b065c 100644 --- a/src/basic/cgroup-util.h +++ b/src/basic/cgroup-util.h @@ -206,9 +206,9 @@ int cg_read_subgroup(DIR *d, char **ret); typedef int (*cg_kill_log_func_t)(const PidRef *pid, int sig, void *userdata); -int cg_kill(const char *path, int sig, CGroupFlags flags, Set *killed_pids, cg_kill_log_func_t kill_log, void *userdata); +int cg_kill(const char *path, int sig, CGroupFlags flags, Set *killed_pids, cg_kill_log_func_t log_kill, void *userdata); int cg_kill_kernel_sigkill(const char *path); -int cg_kill_recursive(const char *path, int sig, CGroupFlags flags, Set *killed_pids, cg_kill_log_func_t kill_log, void *userdata); +int cg_kill_recursive(const char *path, int sig, CGroupFlags flags, Set *killed_pids, cg_kill_log_func_t log_kill, void *userdata); int cg_split_spec(const char *spec, char **ret_controller, char **ret_path); int cg_mangle_path(const char *path, char **ret); diff --git a/src/core/unit.c b/src/core/unit.c index 5cbd0fb76c..f7ff0061fa 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -4928,7 +4928,7 @@ int unit_kill_context(Unit *u, KillOperation k) { SIGHUP, CGROUP_IGNORE_SELF, pid_set, - /* kill_log= */ NULL, + /* log_kill= */ NULL, /* userdata= */ NULL); } } diff --git a/src/udev/udev-manager.c b/src/udev/udev-manager.c index 5601192745..aaaabe0d31 100644 --- a/src/udev/udev-manager.c +++ b/src/udev/udev-manager.c @@ -1321,7 +1321,7 @@ static int on_post(sd_event_source *s, void *userdata) { if (manager->cgroup && set_isempty(manager->synthesize_change_child_event_sources)) /* cleanup possible left-over processes in our cgroup */ - (void) cg_kill(manager->cgroup, SIGKILL, CGROUP_IGNORE_SELF, /* killed_pids=*/ NULL, /* kill_log= */ NULL, /* userdata= */ NULL); + (void) cg_kill(manager->cgroup, SIGKILL, CGROUP_IGNORE_SELF, /* killed_pids=*/ NULL, /* log_kill= */ NULL, /* userdata= */ NULL); return 0; } From a56fc8a070dc2f545299ddc4a38806a0e330e28b Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Wed, 21 May 2025 20:16:05 +0200 Subject: [PATCH 07/13] pcrlock: correct argument comment --- src/pcrlock/pcrlock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pcrlock/pcrlock.c b/src/pcrlock/pcrlock.c index 5dab5ba310..02860e6ca5 100644 --- a/src/pcrlock/pcrlock.c +++ b/src/pcrlock/pcrlock.c @@ -4397,7 +4397,7 @@ static int write_boot_policy_file(const char *json_text) { /* tpm2_device= */ NULL, /* tpm2_hash_pcr_mask= */ 0, /* tpm2_pubkey_path= */ NULL, - /* tpm2_pubkey_path_mask= */ 0, + /* tpm2_pubkey_pcr_mask= */ 0, UID_INVALID, &IOVEC_MAKE_STRING(json_text), CREDENTIAL_ALLOW_NULL, From d7bf63bcad2c9754345ef4d5db1b87326cc0c72a Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Wed, 21 May 2025 20:19:12 +0200 Subject: [PATCH 08/13] creds-util: correct argument comment --- src/shared/creds-util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/creds-util.c b/src/shared/creds-util.c index 55aeace376..93bf121ccf 100644 --- a/src/shared/creds-util.c +++ b/src/shared/creds-util.c @@ -972,7 +972,7 @@ int encrypt_credential_and_warn( r = tpm2_seal(tpm2_context, /* seal_key_handle= */ 0, &tpm2_policy, - /* n_policy_hash= */ 1, + /* n_policy= */ 1, /* pin= */ NULL, &tpm2_key, &blobs, From 03722d712042bebf9237f8b6e7c3a5127aea821f Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Wed, 21 May 2025 20:22:10 +0200 Subject: [PATCH 09/13] tpm2-util: rename 'policy' -> 'pcrlock_policy' Follow the used argument comment naming. --- src/shared/tpm2-util.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/tpm2-util.h b/src/shared/tpm2-util.h index a428ee04a0..4da7e09864 100644 --- a/src/shared/tpm2-util.h +++ b/src/shared/tpm2-util.h @@ -271,7 +271,7 @@ int tpm2_calculate_policy_or(const TPM2B_DIGEST *branches, size_t n_branches, TP int tpm2_calculate_policy_super_pcr(Tpm2PCRPrediction *prediction, uint16_t algorithm, TPM2B_DIGEST *pcr_policy); int tpm2_calculate_policy_signed(TPM2B_DIGEST *digest, const TPM2B_NAME *name); int tpm2_calculate_serialize(TPM2_HANDLE handle, const TPM2B_NAME *name, const TPM2B_PUBLIC *public, void **ret_serialized, size_t *ret_serialized_size); -int tpm2_calculate_sealing_policy(const Tpm2PCRValue *pcr_values, size_t n_pcr_values, const TPM2B_PUBLIC *public, bool use_pin, const Tpm2PCRLockPolicy *policy, TPM2B_DIGEST *digest); +int tpm2_calculate_sealing_policy(const Tpm2PCRValue *pcr_values, size_t n_pcr_values, const TPM2B_PUBLIC *public, bool use_pin, const Tpm2PCRLockPolicy *pcrlock_policy, TPM2B_DIGEST *digest); int tpm2_calculate_seal(TPM2_HANDLE parent_handle, const TPM2B_PUBLIC *parent_public, const TPMA_OBJECT *attributes, const struct iovec *secret, const TPM2B_DIGEST *policy, const char *pin, struct iovec *ret_secret, struct iovec *ret_blob, struct iovec *ret_serialized_parent); int tpm2_get_srk_template(TPMI_ALG_PUBLIC alg, TPMT_PUBLIC *ret_template); From 5c101b06ea4f22d3e2324c23307d12f5dc81207b Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Wed, 21 May 2025 20:34:03 +0200 Subject: [PATCH 10/13] sd-bus: rename 'add_callback' -> 'install_callback' Throughout the whole codebase it is called install_callback. --- src/import/importctl.c | 6 +++--- src/systemd/sd-bus.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/import/importctl.c b/src/import/importctl.c index 9a8c6f08a1..bc80bc3290 100644 --- a/src/import/importctl.c +++ b/src/import/importctl.c @@ -195,7 +195,7 @@ static int transfer_image_common(sd_bus *bus, sd_bus_message *m) { bus_import_mgr, "TransferRemoved", match_transfer_removed, - /* add_callback= */ NULL, + /* install_callback= */ NULL, &c); if (r < 0) return log_error_errno(r, "Failed to request match: %m"); @@ -208,7 +208,7 @@ static int transfer_image_common(sd_bus *bus, sd_bus_message *m) { "org.freedesktop.import1.Transfer", "LogMessage", match_log_message, - /* add_callback= */ NULL, + /* install_callback= */ NULL, &c); if (r < 0) return log_error_errno(r, "Failed to request match: %m"); @@ -221,7 +221,7 @@ static int transfer_image_common(sd_bus *bus, sd_bus_message *m) { "org.freedesktop.import1.Transfer", "ProgressUpdate", match_progress_update, - /* add_callback= */ NULL, + /* install_callback= */ NULL, &c); if (r < 0) return log_error_errno(r, "Failed to request match: %m"); diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h index ad6b36d54c..77cb834121 100644 --- a/src/systemd/sd-bus.h +++ b/src/systemd/sd-bus.h @@ -313,7 +313,7 @@ int sd_bus_query_sender_creds(sd_bus_message *m, uint64_t mask, sd_bus_creds **c int sd_bus_query_sender_privilege(sd_bus_message *m, int capability); int sd_bus_match_signal(sd_bus *bus, sd_bus_slot **ret, const char *sender, const char *path, const char *interface, const char *member, sd_bus_message_handler_t callback, void *userdata); -int sd_bus_match_signal_async(sd_bus *bus, sd_bus_slot **ret, const char *sender, const char *path, const char *interface, const char *member, sd_bus_message_handler_t match_callback, sd_bus_message_handler_t add_callback, void *userdata); +int sd_bus_match_signal_async(sd_bus *bus, sd_bus_slot **ret, const char *sender, const char *path, const char *interface, const char *member, sd_bus_message_handler_t match_callback, sd_bus_message_handler_t install_callback, void *userdata); /* Credential handling */ From 8b67ed854f3ad43dd49ccaafef97f5f118345c48 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Wed, 21 May 2025 20:44:59 +0200 Subject: [PATCH 11/13] validatefs: correct argument comments These functions come from util-linux and can't be renamed. --- src/validatefs/validatefs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/validatefs/validatefs.c b/src/validatefs/validatefs.c index eef4c798f6..e327e4b5b0 100644 --- a/src/validatefs/validatefs.c +++ b/src/validatefs/validatefs.c @@ -257,7 +257,7 @@ static int validate_gpt_label(blkid_probe b, const ValidateFields *f) { return 0; const char *v = NULL; - (void) blkid_probe_lookup_value(b, "PART_ENTRY_NAME", &v, /* ret_len= */ NULL); + (void) blkid_probe_lookup_value(b, "PART_ENTRY_NAME", &v, /* len= */ NULL); if (strv_contains(f->gpt_label, strempty(v))) return 0; @@ -277,7 +277,7 @@ static int validate_gpt_type(blkid_probe b, const ValidateFields *f) { return 0; const char *v = NULL; - (void) blkid_probe_lookup_value(b, "PART_ENTRY_TYPE", &v, /* ret_len= */ NULL); + (void) blkid_probe_lookup_value(b, "PART_ENTRY_TYPE", &v, /* len= */ NULL); sd_id128_t id; if (!v || sd_id128_from_string(v, &id) < 0) { @@ -335,7 +335,7 @@ static int validate_gpt_metadata_one(sd_device *d, const char *path, const Valid assert(r == _BLKID_SAFEPROBE_FOUND); const char *v = NULL; - (void) blkid_probe_lookup_value(b, "PART_ENTRY_SCHEME", &v, /* ret_len= */ NULL); + (void) blkid_probe_lookup_value(b, "PART_ENTRY_SCHEME", &v, /* len= */ NULL); if (!streq_ptr(v, "gpt")) return log_error_errno(SYNTHETIC_ERRNO(EPERM), "File system is supposed to be on a GPT partition table, but is not, refusing."); From 79d70bb28208ba59a09becd70f12eb4123d91db7 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Wed, 21 May 2025 20:49:19 +0200 Subject: [PATCH 12/13] killall: correct argument comment --- src/shared/killall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/killall.c b/src/shared/killall.c index 5db307560f..8735b4feda 100644 --- a/src/shared/killall.c +++ b/src/shared/killall.c @@ -53,7 +53,7 @@ static bool is_in_survivor_cgroup(const PidRef *pid) { assert(pidref_is_set(pid)); - r = cg_pidref_get_path(/* root= */ NULL, pid, &cgroup_path); + r = cg_pidref_get_path(/* controller= */ NULL, pid, &cgroup_path); if (r == -EUNATCH) { log_warning_errno(r, "Process " PID_FMT " appears to originate in foreign namespace, ignoring.", pid->pid); return true; From 637f62392087f5a2178741aabd365ac6aa7a64e1 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Thu, 22 May 2025 10:43:55 +0200 Subject: [PATCH 13/13] treewide: correct argument name to user_icon / askpw_icon --- src/cryptenroll/cryptenroll-fido2.c | 4 ++-- src/home/homectl-fido2.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cryptenroll/cryptenroll-fido2.c b/src/cryptenroll/cryptenroll-fido2.c index e1b8561dd2..3e23a0e47c 100644 --- a/src/cryptenroll/cryptenroll-fido2.c +++ b/src/cryptenroll/cryptenroll-fido2.c @@ -118,8 +118,8 @@ int enroll_fido2( /* user_id= */ un, strlen(un), /* We pass the user ID and name as the same: the disk's UUID if we have it */ /* user_name= */ un, /* user_display_name= */ node, - /* user_icon_name= */ NULL, - /* askpw_icon_name= */ "drive-harddisk", + /* user_icon= */ NULL, + /* askpw_icon= */ "drive-harddisk", /* askpw_credential= */ "cryptenroll.fido2-pin", lock_with, cred_alg, diff --git a/src/home/homectl-fido2.c b/src/home/homectl-fido2.c index 2c44d00324..41f8f206db 100644 --- a/src/home/homectl-fido2.c +++ b/src/home/homectl-fido2.c @@ -171,8 +171,8 @@ int identity_add_fido2_parameters( /* user_id= */ fido_un, strlen(fido_un), /* We pass the user ID and name as the same */ /* user_name= */ fido_un, /* user_display_name= */ rn ? sd_json_variant_string(rn) : NULL, - /* user_icon_name= */ NULL, - /* askpw_icon_name= */ "user-home", + /* user_icon= */ NULL, + /* askpw_icon= */ "user-home", /* askpw_credential= */ "home.token-pin", lock_with, cred_alg,