From 160159a709da1c0d3285386b33aec392231a3045 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Mon, 5 May 2025 19:31:13 +0200 Subject: [PATCH 1/7] resolve: update argument comments --- src/resolve/resolved-dns-packet.c | 2 +- src/resolve/resolved-dns-transaction.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c index 9b22573508..0bf692c06a 100644 --- a/src/resolve/resolved-dns-packet.c +++ b/src/resolve/resolved-dns-packet.c @@ -2364,7 +2364,7 @@ int dns_packet_read_rr( if (r < 0) return r; - r = dns_packet_read_name(p, &rr->naptr.replacement, /* allow_compressed= */ false, NULL); + r = dns_packet_read_name(p, &rr->naptr.replacement, /* allow_compression= */ false, NULL); break; case DNS_TYPE_OPT: /* we only care about the header of OPT for now. */ diff --git a/src/resolve/resolved-dns-transaction.c b/src/resolve/resolved-dns-transaction.c index 3cf92da1f5..12abd8b0e8 100644 --- a/src/resolve/resolved-dns-transaction.c +++ b/src/resolve/resolved-dns-transaction.c @@ -2074,7 +2074,7 @@ static int dns_transaction_make_packet(DnsTransaction *t) { r = dns_packet_new_query( &p, t->scope->protocol, /* min_alloc_dsize = */ 0, - /* dnssec_cd = */ !FLAGS_SET(t->query_flags, SD_RESOLVED_NO_VALIDATE) && + /* dnssec_checking_disabled = */ !FLAGS_SET(t->query_flags, SD_RESOLVED_NO_VALIDATE) && t->scope->dnssec_mode != DNSSEC_NO); if (r < 0) return r; From ff259047d5943986000ffa262eaccffcf44e0589 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Mon, 5 May 2025 19:32:52 +0200 Subject: [PATCH 2/7] shared: fix typo in read_etc_hostname definition --- src/shared/bus-polkit.c | 2 +- src/shared/hostname-setup.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shared/bus-polkit.c b/src/shared/bus-polkit.c index 37a25db81a..0c61464ef0 100644 --- a/src/shared/bus-polkit.c +++ b/src/shared/bus-polkit.c @@ -128,7 +128,7 @@ int bus_test_polkit( _cleanup_(sd_bus_message_unrefp) sd_bus_message *request = NULL, *reply = NULL; int authorized = false, challenge = false; - r = bus_message_new_polkit_auth_call_for_bus(call, action, details, /* interactive = */ false, &request); + r = bus_message_new_polkit_auth_call_for_bus(call, action, details, /* flags = */ false, &request); if (r < 0) return r; diff --git a/src/shared/hostname-setup.h b/src/shared/hostname-setup.h index e3601b8590..526ea0b7eb 100644 --- a/src/shared/hostname-setup.h +++ b/src/shared/hostname-setup.h @@ -22,7 +22,7 @@ int sethostname_idempotent(const char *s); int shorten_overlong(const char *s, char **ret); int read_etc_hostname_stream(FILE *f, bool substitute_wildcards, char **ret); -int read_etc_hostname(const char *path, bool substitue_wildcards, char **ret); +int read_etc_hostname(const char *path, bool substitute_wildcards, char **ret); void hostname_update_source_hint(const char *hostname, HostnameSource source); int hostname_setup(bool really); From 866a662abe6b0631483c90918a00cdd4d37791b5 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Mon, 5 May 2025 19:34:07 +0200 Subject: [PATCH 3/7] treewide: correct argument comments for sd_notifyf --- src/sysupdate/sysupdate.c | 8 ++++---- src/udev/udev-manager.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/sysupdate/sysupdate.c b/src/sysupdate/sysupdate.c index 3bd91ac022..f0c504a290 100644 --- a/src/sysupdate/sysupdate.c +++ b/src/sysupdate/sysupdate.c @@ -970,7 +970,7 @@ static int context_on_acquire_progress(const Transfer *t, const Instance *inst, assert(overall <= 100); log_debug("Transfer %zu/%zu is %u%% complete (%u%% overall).", i+1, n, percentage, overall); - return sd_notifyf(/* unset= */ false, "X_SYSUPDATE_PROGRESS=%u\n" + return sd_notifyf(/* unset_environment=*/ false, "X_SYSUPDATE_PROGRESS=%u\n" "X_SYSUPDATE_TRANSFERS_LEFT=%zu\n" "X_SYSUPDATE_TRANSFERS_DONE=%zu\n" "STATUS=Updating to '%s' (%u%% complete).", @@ -1027,7 +1027,7 @@ static int context_apply( log_info("Selected update '%s' for install.", us->version); - (void) sd_notifyf(/* unset= */ false, + (void) sd_notifyf(/* unset_environment=*/ false, "READY=1\n" "X_SYSUPDATE_VERSION=%s\n" "STATUS=Making room for '%s'.", us->version, us->version); @@ -1045,7 +1045,7 @@ static int context_apply( if (arg_sync) sync(); - (void) sd_notifyf(/* unset= */ false, + (void) sd_notifyf(/* unset_environment=*/ false, "STATUS=Updating to '%s'.", us->version); /* There should now be one instance picked for each transfer, and the order is the same */ @@ -1070,7 +1070,7 @@ static int context_apply( if (arg_sync) sync(); - (void) sd_notifyf(/* unset= */ false, + (void) sd_notifyf(/* unset_environment=*/ false, "STATUS=Installing '%s'.", us->version); for (size_t i = 0; i < c->n_transfers; i++) { diff --git a/src/udev/udev-manager.c b/src/udev/udev-manager.c index 6f67f466d5..d422008c3a 100644 --- a/src/udev/udev-manager.c +++ b/src/udev/udev-manager.c @@ -234,7 +234,7 @@ void manager_exit(Manager *manager) { manager->exit = true; - (void) sd_notify(/* unset= */ false, NOTIFY_STOPPING_MESSAGE); + (void) sd_notify(/* unset_environment= */ false, NOTIFY_STOPPING_MESSAGE); /* close sources of new events and discard buffered events */ manager->ctrl = udev_ctrl_unref(manager->ctrl); @@ -261,7 +261,7 @@ void notify_ready(Manager *manager) { assert(manager); - r = sd_notifyf(/* unset= */ false, + r = sd_notifyf(/* unset_environment= */ false, "READY=1\n" "STATUS=Processing with %u children at max", manager->config.children_max); if (r < 0) From 5cdec544c7350139f3db4d65156cbd1f89abc613 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Mon, 5 May 2025 19:38:18 +0200 Subject: [PATCH 4/7] libsystemd-network: fix typo in argument comment --- src/libsystemd-network/sd-ndisc-router.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsystemd-network/sd-ndisc-router.c b/src/libsystemd-network/sd-ndisc-router.c index c978547f81..6936ea34e2 100644 --- a/src/libsystemd-network/sd-ndisc-router.c +++ b/src/libsystemd-network/sd-ndisc-router.c @@ -114,7 +114,7 @@ int ndisc_router_parse(sd_ndisc *nd, sd_ndisc_router *rt) { rt->hop_limit = a->nd_ra_curhoplimit; rt->flags = a->nd_ra_flags_reserved; /* the first 8 bits */ rt->lifetime_usec = be16_sec_to_usec(a->nd_ra_router_lifetime, /* max_as_infinity = */ false); - rt->reachable_time_usec = be32_msec_to_usec(a->nd_ra_reachable, /* mas_as_infinity = */ false); + rt->reachable_time_usec = be32_msec_to_usec(a->nd_ra_reachable, /* max_as_infinity = */ false); rt->retransmission_time_usec = be32_msec_to_usec(a->nd_ra_retransmit, /* max_as_infinity = */ false); /* RFC 4191 section 2.2 From 60f6d70a299f039f6583efbcc5a64e404a75d9d2 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Mon, 5 May 2025 19:47:49 +0200 Subject: [PATCH 5/7] network: correct argument comments --- src/network/networkd-sysctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/networkd-sysctl.c b/src/network/networkd-sysctl.c index b03e64b8e5..f5aad84c3b 100644 --- a/src/network/networkd-sysctl.c +++ b/src/network/networkd-sysctl.c @@ -588,7 +588,7 @@ static int link_set_ipv6_mtu_async_impl(Link *link) { link->manager->event, &link->ipv6_mtu_wait_synced_event_source, CLOCK_BOOTTIME, 100 * USEC_PER_MSEC, 0, ipv6_mtu_wait_synced_handler, link, - /* priority = */ 0, "ipv6-mtu-wait-synced", /* force = */ true); + /* priority = */ 0, "ipv6-mtu-wait-synced", /* force_reset = */ true); if (r < 0) return log_link_warning_errno(link, r, "Failed to configure timer event source for waiting for IPv6 MTU being synced: %m"); From 4b779c874c5d394e637af4a1d07e91c99010c293 Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Mon, 5 May 2025 21:34:31 +0200 Subject: [PATCH 6/7] shared: rename type to fstype Follow the argument comment naming already used. --- src/shared/mount-util.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/shared/mount-util.h b/src/shared/mount-util.h index fa55c9d32c..5541d0cab3 100644 --- a/src/shared/mount-util.h +++ b/src/shared/mount-util.h @@ -49,7 +49,7 @@ int mount_verbose_full( int error_log_level, const char *what, const char *where, - const char *type, + const char *fstype, unsigned long flags, const char *options, bool follow_symlink); @@ -58,20 +58,20 @@ static inline int mount_follow_verbose( int error_log_level, const char *what, const char *where, - const char *type, + const char *fstype, unsigned long flags, const char *options) { - return mount_verbose_full(error_log_level, what, where, type, flags, options, true); + return mount_verbose_full(error_log_level, what, where, fstype, flags, options, true); } static inline int mount_nofollow_verbose( int error_log_level, const char *what, const char *where, - const char *type, + const char *fstype, unsigned long flags, const char *options) { - return mount_verbose_full(error_log_level, what, where, type, flags, options, false); + return mount_verbose_full(error_log_level, what, where, fstype, flags, options, false); } int umount_verbose( From 3ce45cd3ac2ff4e863e44c2977586d90d007d96a Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Tue, 6 May 2025 09:31:50 +0200 Subject: [PATCH 7/7] shared: fix leftover bool value from flags conversion Follow-up for 5c48335ef4cc1c930c86c6e893f3ab3e5472f7f6 --- src/shared/bus-polkit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/bus-polkit.c b/src/shared/bus-polkit.c index 0c61464ef0..97d81e743c 100644 --- a/src/shared/bus-polkit.c +++ b/src/shared/bus-polkit.c @@ -128,7 +128,7 @@ int bus_test_polkit( _cleanup_(sd_bus_message_unrefp) sd_bus_message *request = NULL, *reply = NULL; int authorized = false, challenge = false; - r = bus_message_new_polkit_auth_call_for_bus(call, action, details, /* flags = */ false, &request); + r = bus_message_new_polkit_auth_call_for_bus(call, action, details, /* flags = */ 0, &request); if (r < 0) return r;