From 23bbb0de4e3f85d9704a5c12a5afa2dfa0159e41 Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Fri, 28 Nov 2014 18:23:20 +0100 Subject: treewide: more log_*_errno + return simplifications --- src/binfmt/binfmt.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/binfmt/binfmt.c') 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); -- cgit v1.2.3-54-g00ecf