From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 30 Apr 2025 10:20:40 +0000 (+0200)
Subject: daemon-util: Rename starting/stopping message constants
X-Git-Tag: v258-rc1~701^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=792a8bfb8a62c2d3a49297c0bb52178987611f9f;p=thirdparty%2Fsystemd.git

daemon-util: Rename starting/stopping message constants

Currently, NOTIFY_READY from daemon-util.h conflicts with NOTIFY_READY
from NotifyState from service.h so let's rename the constants to avoid
the conflict.
---

diff --git a/src/home/homed.c b/src/home/homed.c
index bb9d3360d0d..652e32ec7c1 100644
--- a/src/home/homed.c
+++ b/src/home/homed.c
@@ -39,7 +39,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return log_error_errno(r, "Failed to start up daemon: %m");
 
-        notify_stop = notify_start(NOTIFY_READY, NOTIFY_STOPPING);
+        notify_stop = notify_start(NOTIFY_READY_MESSAGE, NOTIFY_STOPPING_MESSAGE);
 
         r = sd_event_loop(m->event);
         if (r < 0)
diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index 15c27af090d..962c5681e41 100644
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -1939,7 +1939,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return r;
 
-        r = sd_notify(false, NOTIFY_READY);
+        r = sd_notify(false, NOTIFY_READY_MESSAGE);
         if (r < 0)
                 log_warning_errno(r, "Failed to send readiness notification, ignoring: %m");
 
diff --git a/src/import/importd.c b/src/import/importd.c
index b584a0e685a..a7de9ed2479 100644
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -2044,7 +2044,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return r;
 
-        r = sd_notify(false, NOTIFY_READY);
+        r = sd_notify(false, NOTIFY_READY_MESSAGE);
         if (r < 0)
                 log_warning_errno(r, "Failed to send readiness notification, ignoring: %m");
 
diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c
index f0f722ac3ef..bf3092ff314 100644
--- a/src/initctl/initctl.c
+++ b/src/initctl/initctl.c
@@ -328,7 +328,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return r;
 
-        notify_stop = notify_start(NOTIFY_READY, NOTIFY_STOPPING);
+        notify_stop = notify_start(NOTIFY_READY_MESSAGE, NOTIFY_STOPPING_MESSAGE);
 
         while (!server.quit) {
                 struct epoll_event event;
diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c
index d33a7ab6b6f..e244b668ee3 100644
--- a/src/journal-remote/journal-remote-main.c
+++ b/src/journal-remote/journal-remote-main.c
@@ -1180,7 +1180,7 @@ static int run(int argc, char **argv) {
         log_debug("%s running as pid "PID_FMT,
                   program_invocation_short_name, getpid_cached());
 
-        notify_message = notify_start(NOTIFY_READY, NOTIFY_STOPPING);
+        notify_message = notify_start(NOTIFY_READY_MESSAGE, NOTIFY_STOPPING_MESSAGE);
 
         while (s.active) {
                 r = sd_event_get_state(s.event);
diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c
index 7bf10f4de94..6de13e01f72 100644
--- a/src/journal-remote/journal-upload.c
+++ b/src/journal-remote/journal-upload.c
@@ -982,7 +982,7 @@ static int run(int argc, char **argv) {
 
         notify_message = notify_start("READY=1\n"
                                       "STATUS=Processing input...",
-                                      NOTIFY_STOPPING);
+                                      NOTIFY_STOPPING_MESSAGE);
 
         for (;;) {
                 r = sd_event_get_state(u.event);
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 0a50467aaaa..0593b97b160 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -2057,7 +2057,7 @@ static int dispatch_notify_event(sd_event_source *es, int fd, uint32_t revents,
          * there's something to send it will be turned on again. */
 
         if (!s->sent_notify_ready) {
-                if (send(s->notify_fd, NOTIFY_READY, strlen(NOTIFY_READY), MSG_DONTWAIT) < 0) {
+                if (send(s->notify_fd, NOTIFY_READY_MESSAGE, strlen(NOTIFY_READY_MESSAGE), MSG_DONTWAIT) < 0) {
                         if (errno == EAGAIN)
                                 return 0;
 
diff --git a/src/locale/localed.c b/src/locale/localed.c
index 5fc45819ca7..3f742b8a627 100644
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -664,7 +664,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return r;
 
-        r = sd_notify(false, NOTIFY_READY);
+        r = sd_notify(false, NOTIFY_READY_MESSAGE);
         if (r < 0)
                 log_warning_errno(r, "Failed to send readiness notification, ignoring: %m");
 
diff --git a/src/login/logind.c b/src/login/logind.c
index e07b9e52965..ad76b069727 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -1088,7 +1088,7 @@ static int manager_dispatch_reload_signal(sd_event_source *s, const struct signa
         else
                 log_info("Config file reloaded.");
 
-        (void) sd_notify(/* unset= */ false, NOTIFY_READY);
+        (void) sd_notify(/* unset= */ false, NOTIFY_READY_MESSAGE);
         return 0;
 }
 
@@ -1268,7 +1268,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return log_error_errno(r, "Failed to fully start up daemon: %m");
 
-        notify_message = notify_start(NOTIFY_READY, NOTIFY_STOPPING);
+        notify_message = notify_start(NOTIFY_READY_MESSAGE, NOTIFY_STOPPING_MESSAGE);
         return manager_run(m);
 }
 
diff --git a/src/machine/machined.c b/src/machine/machined.c
index bc2739268f3..364f9dfab67 100644
--- a/src/machine/machined.c
+++ b/src/machine/machined.c
@@ -345,7 +345,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return log_error_errno(r, "Failed to fully start up daemon: %m");
 
-        r = sd_notify(false, NOTIFY_READY);
+        r = sd_notify(false, NOTIFY_READY_MESSAGE);
         if (r < 0)
                 log_warning_errno(r, "Failed to send readiness notification, ignoring: %m");
 
diff --git a/src/mountfsd/mountfsd.c b/src/mountfsd/mountfsd.c
index 6073bd548e5..87f4ab725a6 100644
--- a/src/mountfsd/mountfsd.c
+++ b/src/mountfsd/mountfsd.c
@@ -31,7 +31,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return log_error_errno(r, "Failed to start up daemon: %m");
 
-        notify_stop = notify_start(NOTIFY_READY, NOTIFY_STOPPING);
+        notify_stop = notify_start(NOTIFY_READY_MESSAGE, NOTIFY_STOPPING_MESSAGE);
 
         r = sd_event_loop(m->event);
         if (r < 0)
diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index f4e8c41a764..cf713f3ffef 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -1229,6 +1229,6 @@ int manager_reload(Manager *m, sd_bus_message *message) {
         log_debug("Reloaded.");
         r = 0;
 finish:
-        (void) sd_notify(/* unset_environment= */ false, NOTIFY_READY);
+        (void) sd_notify(/* unset_environment= */ false, NOTIFY_READY_MESSAGE);
         return r;
 }
diff --git a/src/network/networkd.c b/src/network/networkd.c
index 2060e6b2fa3..d39cb19ed2d 100644
--- a/src/network/networkd.c
+++ b/src/network/networkd.c
@@ -108,7 +108,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return log_error_errno(r, "Could not start manager: %m");
 
-        notify_message = notify_start(NOTIFY_READY, NOTIFY_STOPPING);
+        notify_message = notify_start(NOTIFY_READY_MESSAGE, NOTIFY_STOPPING_MESSAGE);
 
         r = sd_event_loop(m->event);
         if (r < 0)
diff --git a/src/nsresourced/nsresourced.c b/src/nsresourced/nsresourced.c
index 07df95b4d7b..ff84f766cd9 100644
--- a/src/nsresourced/nsresourced.c
+++ b/src/nsresourced/nsresourced.c
@@ -34,7 +34,7 @@ static int run(int argc, char *argv[]) {
                 return log_error_errno(r, "Failed to start up daemon: %m");
 
         _unused_ _cleanup_(notify_on_cleanup) const char *notify_stop = NULL;
-        notify_stop = notify_start(NOTIFY_READY, NOTIFY_STOPPING);
+        notify_stop = notify_start(NOTIFY_READY_MESSAGE, NOTIFY_STOPPING_MESSAGE);
 
         r = sd_event_loop(m->event);
         if (r < 0)
diff --git a/src/oom/oomd-manager.c b/src/oom/oomd-manager.c
index dcec133d6f1..d62c07def46 100644
--- a/src/oom/oomd-manager.c
+++ b/src/oom/oomd-manager.c
@@ -660,7 +660,7 @@ static int manager_dispatch_reload_signal(sd_event_source *s, const struct signa
         manager_set_defaults(m);
         manager_parse_config_file(m);
 
-        (void) sd_notify(/* unset= */ false, NOTIFY_READY);
+        (void) sd_notify(/* unset= */ false, NOTIFY_READY_MESSAGE);
         return 0;
 }
 
diff --git a/src/oom/oomd.c b/src/oom/oomd.c
index 15cbb3a2c35..11d11a3dc8a 100644
--- a/src/oom/oomd.c
+++ b/src/oom/oomd.c
@@ -152,7 +152,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return log_error_errno(r, "Failed to start up daemon: %m");
 
-        notify_msg = notify_start(NOTIFY_READY, NOTIFY_STOPPING);
+        notify_msg = notify_start(NOTIFY_READY_MESSAGE, NOTIFY_STOPPING_MESSAGE);
 
         log_debug("systemd-oomd started%s.", arg_dry_run ? " in dry run mode" : "");
 
diff --git a/src/portable/portabled.c b/src/portable/portabled.c
index 75872d51fe8..d94feb34cf6 100644
--- a/src/portable/portabled.c
+++ b/src/portable/portabled.c
@@ -152,7 +152,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return log_error_errno(r, "Failed to fully start up daemon: %m");
 
-        r = sd_notify(false, NOTIFY_READY);
+        r = sd_notify(false, NOTIFY_READY_MESSAGE);
         if (r < 0)
                 log_warning_errno(r, "Failed to send readiness notification, ignoring: %m");
 
diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
index 78b14ea3bf5..e130fe6fdaf 100644
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
@@ -690,7 +690,7 @@ static int manager_dispatch_reload_signal(sd_event_source *s, const struct signa
         manager_flush_caches(m, LOG_INFO);
         manager_verify_all(m);
 
-        (void) sd_notify(/* unset= */ false, NOTIFY_READY);
+        (void) sd_notify(/* unset= */ false, NOTIFY_READY_MESSAGE);
         return 0;
 }
 
diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c
index d6a7f0cf5a8..a0c80180239 100644
--- a/src/resolve/resolved.c
+++ b/src/resolve/resolved.c
@@ -85,7 +85,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return log_error_errno(r, "Failed to drop remaining caps: %m");
 
-        notify_stop = notify_start(NOTIFY_READY, NOTIFY_STOPPING);
+        notify_stop = notify_start(NOTIFY_READY_MESSAGE, NOTIFY_STOPPING_MESSAGE);
 
         r = sd_event_loop(m->event);
         if (r < 0)
diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index a2b6a480035..764548339d3 100644
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -154,7 +154,7 @@ int bus_event_loop_with_idle(
 
                         /* Inform the service manager that we are going down, so that it will queue all
                          * further start requests, instead of assuming we are still running. */
-                        (void) sd_notify(false, NOTIFY_STOPPING);
+                        (void) sd_notify(false, NOTIFY_STOPPING_MESSAGE);
 
                         r = bus_async_unregister_and_exit(e, bus, name);
                         if (r < 0)
diff --git a/src/shared/daemon-util.h b/src/shared/daemon-util.h
index ff5e60e9be9..e3daa9ebf50 100644
--- a/src/shared/daemon-util.h
+++ b/src/shared/daemon-util.h
@@ -7,8 +7,8 @@
 
 #include "macro.h"
 
-#define NOTIFY_READY "READY=1\n" "STATUS=Processing requests..."
-#define NOTIFY_STOPPING "STOPPING=1\n" "STATUS=Shutting down..."
+#define NOTIFY_READY_MESSAGE "READY=1\n" "STATUS=Processing requests..."
+#define NOTIFY_STOPPING_MESSAGE "STOPPING=1\n" "STATUS=Shutting down..."
 
 static inline const char* notify_start(const char *start, const char *stop) {
         if (start)
diff --git a/src/socket-activate/socket-activate.c b/src/socket-activate/socket-activate.c
index 336d6fa754f..c37fafd34a8 100644
--- a/src/socket-activate/socket-activate.c
+++ b/src/socket-activate/socket-activate.c
@@ -478,7 +478,7 @@ static int run(int argc, char **argv) {
                 if (r < 0)
                         return r;
 
-                notify = notify_start(NOTIFY_READY, NOTIFY_STOPPING);
+                notify = notify_start(NOTIFY_READY_MESSAGE, NOTIFY_STOPPING_MESSAGE);
         }
 
         for (;;) {
diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c
index 6c406175631..fb430757e30 100644
--- a/src/socket-proxy/socket-proxyd.c
+++ b/src/socket-proxy/socket-proxyd.c
@@ -688,7 +688,7 @@ static int run(int argc, char *argv[]) {
                         return r;
         }
 
-        notify_stop = notify_start(NOTIFY_READY, NOTIFY_STOPPING);
+        notify_stop = notify_start(NOTIFY_READY_MESSAGE, NOTIFY_STOPPING_MESSAGE);
         r = sd_event_loop(context.event);
         if (r < 0)
                 return log_error_errno(r, "Failed to run event loop: %m");
diff --git a/src/storagetm/storagetm.c b/src/storagetm/storagetm.c
index fbdf35df995..1f1ebe2e8fe 100644
--- a/src/storagetm/storagetm.c
+++ b/src/storagetm/storagetm.c
@@ -1240,7 +1240,7 @@ static int run(int argc, char* argv[]) {
         _unused_ _cleanup_(notify_on_cleanup) const char *notify_message =
                 notify_start("READY=1\n"
                              "STATUS=Exposing disks in target mode...",
-                             NOTIFY_STOPPING);
+                             NOTIFY_STOPPING_MESSAGE);
 
         r = sd_event_loop(event);
         if (r < 0)
diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index c235573b926..5e0fb165a79 100644
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -1182,7 +1182,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return r;
 
-        r = sd_notify(false, NOTIFY_READY);
+        r = sd_notify(false, NOTIFY_READY_MESSAGE);
         if (r < 0)
                 log_warning_errno(r, "Failed to send readiness notification, ignoring: %m");
 
diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c
index cecd9fd6ea9..6537f1ae923 100644
--- a/src/timesync/timesyncd.c
+++ b/src/timesync/timesyncd.c
@@ -205,7 +205,7 @@ static int run(int argc, char *argv[]) {
 
         notify_message = notify_start("READY=1\n"
                                       "STATUS=Daemon is running",
-                                      NOTIFY_STOPPING);
+                                      NOTIFY_STOPPING_MESSAGE);
 
         r = manager_setup_save_time_event(m);
         if (r < 0)
diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c
index a9240551f09..fd28591d197 100644
--- a/src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -406,7 +406,7 @@ static int process_and_watch_password_files(bool watch) {
         }
 
         _unused_ _cleanup_(notify_on_cleanup) const char *notify_stop =
-                notify_start(NOTIFY_READY, NOTIFY_STOPPING);
+                notify_start(NOTIFY_READY_MESSAGE, NOTIFY_STOPPING_MESSAGE);
 
         for (;;) {
                 usec_t timeout = USEC_INFINITY;
diff --git a/src/udev/udev-manager.c b/src/udev/udev-manager.c
index 2026e24f5d6..6f67f466d5e 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);
+        (void) sd_notify(/* unset= */ false, NOTIFY_STOPPING_MESSAGE);
 
         /* close sources of new events and discard buffered events */
         manager->ctrl = udev_ctrl_unref(manager->ctrl);
@@ -1407,7 +1407,7 @@ int manager_main(Manager *manager) {
                 log_warning_errno(r, "Failed to apply permissions on static device nodes, ignoring: %m");
 
         _unused_ _cleanup_(notify_on_cleanup) const char *notify_message =
-                notify_start(NOTIFY_READY, NOTIFY_STOPPING);
+                notify_start(NOTIFY_READY_MESSAGE, NOTIFY_STOPPING_MESSAGE);
 
         /* We will start processing events in the loop below. Before starting processing, let's remove the
          * event serialization fd from the fdstore, to avoid retrieving the serialized events again in future
diff --git a/src/userdb/userdbd.c b/src/userdb/userdbd.c
index 434a50a329e..64babef1c40 100644
--- a/src/userdb/userdbd.c
+++ b/src/userdb/userdbd.c
@@ -47,7 +47,7 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return log_error_errno(r, "Failed to start up daemon: %m");
 
-        notify_stop = notify_start(NOTIFY_READY, NOTIFY_STOPPING);
+        notify_stop = notify_start(NOTIFY_READY_MESSAGE, NOTIFY_STOPPING_MESSAGE);
 
         r = sd_event_loop(m->event);
         if (r < 0)