From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 6 Aug 2018 17:03:27 +0000 (+0200)
Subject: logind: make better use of logging functions
X-Git-Tag: v240~549^2~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e555d12635007da7263d0a43ed7307e70a07720d;p=thirdparty%2Fsystemd.git

logind: make better use of logging functions
---

diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c
index 824bef02a26..d67ff116e41 100644
--- a/src/login/logind-seat.c
+++ b/src/login/logind-seat.c
@@ -199,10 +199,8 @@ int seat_preallocate_vts(Seat *s) {
                 int q;
 
                 q = vt_allocate(i);
-                if (q < 0) {
-                        log_error_errno(q, "Failed to preallocate VT %u: %m", i);
-                        r = q;
-                }
+                if (q < 0)
+                        r = log_error_errno(q, "Failed to preallocate VT %u: %m", i);
         }
 
         return r;
@@ -219,9 +217,9 @@ int seat_apply_acls(Seat *s, Session *old_active) {
                             !!s->active, s->active ? s->active->user->uid : 0);
 
         if (r < 0)
-                log_error_errno(r, "Failed to apply ACLs: %m");
+                return log_error_errno(r, "Failed to apply ACLs: %m");
 
-        return r;
+        return 0;
 }
 
 int seat_set_active(Seat *s, Session *session) {