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] 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 3bd91ac0224..f0c504a2903 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 6f67f466d5e..d422008c3ad 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) -- 2.47.3