summaryrefslogtreecommitdiff
path: root/src/binfmt
diff options
context:
space:
mode:
authorMichal Schmidt <mschmidt@redhat.com>2014-11-28 18:23:20 +0100
committerMichal Schmidt <mschmidt@redhat.com>2014-11-28 18:24:30 +0100
commit23bbb0de4e3f85d9704a5c12a5afa2dfa0159e41 (patch)
tree28e66fb86dd0cffc3a3cca3cf234cb52c3b64ad3 /src/binfmt
parent5e03c6e3b517286bbd65b48d88f60e5b83721894 (diff)
downloadsystemd-23bbb0de4e3f85d9704a5c12a5afa2dfa0159e41.tar.gz
systemd-23bbb0de4e3f85d9704a5c12a5afa2dfa0159e41.tar.bz2
systemd-23bbb0de4e3f85d9704a5c12a5afa2dfa0159e41.zip
treewide: more log_*_errno + return simplifications
Diffstat (limited to 'src/binfmt')
-rw-r--r--src/binfmt/binfmt.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c
index 7fb0664988..cbba42f6dc 100644
--- a/src/binfmt/binfmt.c
+++ b/src/binfmt/binfmt.c
@@ -64,10 +64,8 @@ static int apply_rule(const char *rule) {
delete_rule(rule);
r = write_string_file("/proc/sys/fs/binfmt_misc/register", rule);
- if (r < 0) {
- log_error_errno(r, "Failed to add binary format: %m");
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to add binary format: %m");
return 0;
}
@@ -83,8 +81,7 @@ static int apply_file(const char *path, bool ignore_enoent) {
if (ignore_enoent && r == -ENOENT)
return 0;
- log_error_errno(r, "Failed to open file '%s', ignoring: %m", path);
- return r;
+ return log_error_errno(r, "Failed to open file '%s', ignoring: %m", path);
}
log_debug("apply: %s", path);