]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
logind: rework sd_eviocrevoke()
authorLennart Poettering <lennart@poettering.net>
Mon, 26 Feb 2018 17:32:07 +0000 (18:32 +0100)
committerLennart Poettering <lennart@poettering.net>
Mon, 26 Feb 2018 17:32:07 +0000 (18:32 +0100)
Let's initialize static variables properly and get rid of redundant
variables.

src/login/logind-session-device.c

index b1bac04036a0ddf20414b05a6f150a7df4cd059a..0992f26d653200bb6d60c3cec913b756ded7cf79 100644 (file)
@@ -107,17 +107,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");
                 }
         }