]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
tree-wide: drop "f" from sd_notify() calls with a static string
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 3 Nov 2021 10:12:25 +0000 (11:12 +0100)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 3 Nov 2021 10:29:49 +0000 (11:29 +0100)
If we don't need to do any formatting, let's optimize things a bit.

src/core/manager.c
src/nspawn/nspawn.c
src/timesync/timesyncd-manager.c

index d48e0b08783745df2bd169cc805c2146f2bb8d55..c0de6acb80396487e9631e9ae1864ed23ed645c8 100644 (file)
@@ -3465,9 +3465,9 @@ static void user_manager_send_ready(Manager *m) {
         if (!MANAGER_IS_USER(m) || m->ready_sent)
                 return;
 
-        r = sd_notifyf(false,
-                       "READY=1\n"
-                       "STATUS=Reached " SPECIAL_BASIC_TARGET ".");
+        r = sd_notify(false,
+                      "READY=1\n"
+                      "STATUS=Reached " SPECIAL_BASIC_TARGET ".");
         if (r < 0)
                 log_warning_errno(r, "Failed to send readiness notification, ignoring: %m");
 
index 7dc9e068422c42d8d29e4db95bcdc8198c871007..3727d903985e30ef7bf6a1faf9f8ebb1244716b5 100644 (file)
@@ -4245,7 +4245,7 @@ static int nspawn_dispatch_notify_fd(sd_event_source *source, int fd, uint32_t r
                 return log_oom();
 
         if (strv_find(tags, "READY=1")) {
-                r = sd_notifyf(false, "READY=1\n");
+                r = sd_notify(false, "READY=1\n");
                 if (r < 0)
                         log_warning_errno(r, "Failed to send readiness notification, ignoring: %m");
         }
index f21c5c316ba178a0696334d737d6c14da0905e29..918da195d811083cbeaf0c2dbeefaba84a22ccd8 100644 (file)
@@ -915,7 +915,7 @@ void manager_disconnect(Manager *m) {
 
         m->event_timeout = sd_event_source_unref(m->event_timeout);
 
-        sd_notifyf(false, "STATUS=Idle.");
+        sd_notify(false, "STATUS=Idle.");
 }
 
 void manager_flush_server_names(Manager  *m, ServerType t) {