summaryrefslogtreecommitdiff
path: root/src/shutdownd/shutdownd.c
diff options
context:
space:
mode:
authorMichal Schmidt <mschmidt@redhat.com>2014-11-28 18:50:43 +0100
committerMichal Schmidt <mschmidt@redhat.com>2014-11-28 18:56:16 +0100
commitf647962d64e844689f3e2acfce6102fc47e76df2 (patch)
treedcaf5e38de1d4e31f73f540bc85532ceb72cfa6b /src/shutdownd/shutdownd.c
parente80733be33e52d8ab2f1ae845326d39c600f5612 (diff)
treewide: yet more log_*_errno + return simplifications
Using: find . -name '*.[ch]' | while read f; do perl -i.mmm -e \ 'local $/; local $_=<>; s/(if\s*\([^\n]+\))\s*{\n(\s*)(log_[a-z_]*_errno\(\s*([->a-zA-Z_]+)\s*,[^;]+);\s*return\s+\g4;\s+}/\1\n\2return \3;/msg; print;' $f done And a couple of manual whitespace fixups.
Diffstat (limited to 'src/shutdownd/shutdownd.c')
-rw-r--r--src/shutdownd/shutdownd.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/shutdownd/shutdownd.c b/src/shutdownd/shutdownd.c
index 5f109f823b..cdad583bcb 100644
--- a/src/shutdownd/shutdownd.c
+++ b/src/shutdownd/shutdownd.c
@@ -203,20 +203,16 @@ static int update_schedule_file(struct sd_shutdown_command *c) {
assert(c);
r = mkdir_safe_label("/run/systemd/shutdown", 0755, 0, 0);
- if (r < 0) {
- log_error_errno(r, "Failed to create shutdown subdirectory: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to create shutdown subdirectory: %m");
t = cescape(c->wall_message);
if (!t)
return log_oom();
r = fopen_temporary("/run/systemd/shutdown/scheduled", &f, &temp_path);
- if (r < 0) {
- log_error_errno(r, "Failed to save information about scheduled shutdowns: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to save information about scheduled shutdowns: %m");
fchmod(fileno(f), 0644);