From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 23 Jul 2016 00:27:45 +0000 (-0400)
Subject: Use "return log_error_errno" in more places"
X-Git-Tag: v231.3~61
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=66c622e4c2c1cbfb287033ce8045d0988ac6a78e;p=elogind.git

Use "return log_error_errno" in more places"
---

diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index 4784fac31..5c2d9a57c 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -317,8 +317,7 @@ int user_load(User *u) {
                 if (r == -ENOENT)
                         return 0;
 
-                log_error_errno(r, "Failed to read %s: %m", u->state_file);
-                return r;
+                return log_error_errno(r, "Failed to read %s: %m", u->state_file);
         }
 
         if (display)
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index 94b0078df..8e6fffe18 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -322,8 +322,7 @@ int config_parse(const char *unit,
                         if (feof(f))
                                 break;
 
-                        log_error_errno(errno, "Failed to read configuration file '%s': %m", filename);
-                        return -errno;
+                        return log_error_errno(errno, "Failed to read configuration file '%s': %m", filename);
                 }
 
                 l = buf;