core: convert log_unit_*() to log_unit_*_errno()

[elogind.git] / src / shutdownd / shutdownd.c

diff --git a/src/shutdownd/shutdownd.c b/src/shutdownd/shutdownd.c
index 92907497ed4aaa2ad8b110d19d9ba89d1312acb6..5f109f823bcfccfced151ef8864d490261de2bc4 100644 (file)
--- a/src/shutdownd/shutdownd.c
+++ b/src/shutdownd/shutdownd.c
@@ -52,8 +52,8 @@ static int read_packet(int fd, union shutdown_buffer *_b) {
         union shutdown_buffer b; /* We maintain our own copy here, in
                                   * order not to corrupt the last message */
         struct iovec iovec = {
-                iovec.iov_base = &b,
-                iovec.iov_len = sizeof(b) - 1,
+                .iov_base = &b,
+                .iov_len = sizeof(b) - 1,
         };
         union {
                 struct cmsghdr cmsghdr;
@@ -204,7 +204,7 @@ static int update_schedule_file(struct sd_shutdown_command *c) {
 
         r = mkdir_safe_label("/run/systemd/shutdown", 0755, 0, 0);
         if (r < 0) {
-                log_error("Failed to create shutdown subdirectory: %s", strerror(-r));
+                log_error_errno(r, "Failed to create shutdown subdirectory: %m");
                 return r;
         }
 
@@ -214,7 +214,7 @@ static int update_schedule_file(struct sd_shutdown_command *c) {
 
         r = fopen_temporary("/run/systemd/shutdown/scheduled", &f, &temp_path);
         if (r < 0) {
-                log_error("Failed to save information about scheduled shutdowns: %s", strerror(-r));
+                log_error_errno(r, "Failed to save information about scheduled shutdowns: %m");
                 return r;
         }
 
@@ -284,7 +284,7 @@ int main(int argc, char *argv[]) {
 
         n_fds = sd_listen_fds(true);
         if (n_fds < 0) {
-                log_error("Failed to read listening file descriptors from environment: %s", strerror(-r));
+                log_error_errno(r, "Failed to read listening file descriptors from environment: %m");
                 return EXIT_FAILURE;
         }
 
@@ -410,7 +410,7 @@ int main(int argc, char *argv[]) {
 
                         e = write_string_file_atomic("/run/nologin", "System is going down.");
                         if (e < 0)
-                                log_error("Failed to create /run/nologin: %s", strerror(-e));
+                                log_error_errno(e, "Failed to create /run/nologin: %m");
                         else
                                 unlink_nologin = true;
 
@@ -456,6 +456,7 @@ finish:
         }
 
         sd_notify(false,
+                  "STOPPING=\n"
                   "STATUS=Exiting...");
 
         return r;