From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 26 Feb 2018 17:32:07 +0000 (+0100)
Subject: logind: rework sd_eviocrevoke()
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=94f8dafc1c6c03d5ab3694941905578c3f39fc4c;p=elogind.git

logind: rework sd_eviocrevoke()

Let's initialize static variables properly and get rid of redundant
variables.
---

diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c
index cc56e62df..b74f31a37 100644
--- a/src/login/logind-session-device.c
+++ b/src/login/logind-session-device.c
@@ -111,17 +111,15 @@ static int session_device_notify(SessionDevice *sd, enum SessionDeviceNotificati
 }
 
 static int sd_eviocrevoke(int fd) {
-        static bool warned;
-        int r;
+        static bool warned = false;
 
         assert(fd >= 0);
 
-        r = ioctl(fd, EVIOCREVOKE, NULL);
-        if (r < 0) {
-                r = -errno;
-                if (r == -EINVAL && !warned) {
+        if (ioctl(fd, EVIOCREVOKE, NULL) < 0) {
+
+                if (errno == EINVAL && !warned) {
+                        log_warning_errno(errno, "Kernel does not support evdev-revocation: %m");
                         warned = true;
-                        log_warning("kernel does not support evdev-revocation");
                 }
         }