summaryrefslogtreecommitdiff
path: root/src/shutdownd/shutdownd.c
diff options
context:
space:
mode:
authorMichal Schmidt <mschmidt@redhat.com>2014-11-28 11:58:34 +0100
committerMichal Schmidt <mschmidt@redhat.com>2014-11-28 12:04:41 +0100
commit0a1beeb64207eaa88ab9236787b1cbc2f704ae14 (patch)
tree50117277be2e2078d0373b944a30b4f09bb94443 /src/shutdownd/shutdownd.c
parentb4d23205f238e06aaa31264628e20669e714acad (diff)
treewide: auto-convert the simple cases to log_*_errno()
As a followup to 086891e5c1 "log: add an "error" parameter to all low-level logging calls and intrdouce log_error_errno() as log calls that take error numbers", use sed to convert the simple cases to use the new macros: find . -name '*.[ch]' | xargs sed -r -i -e \ 's/log_(debug|info|notice|warning|error|emergency)\("(.*)%s"(.*), strerror\(-([a-zA-Z_]+)\)\);/log_\1_errno(-\4, "\2%m"\3);/' Multi-line log_*() invocations are not covered. And we also should add log_unit_*_errno().
Diffstat (limited to 'src/shutdownd/shutdownd.c')
-rw-r--r--src/shutdownd/shutdownd.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/shutdownd/shutdownd.c b/src/shutdownd/shutdownd.c
index 0f008a6100..c443a90179 100644
--- a/src/shutdownd/shutdownd.c
+++ b/src/shutdownd/shutdownd.c
@@ -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;