From 94f8dafc1c6c03d5ab3694941905578c3f39fc4c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 26 Feb 2018 18:32:07 +0100 Subject: [PATCH] logind: rework sd_eviocrevoke() Let's initialize static variables properly and get rid of redundant variables. --- src/login/logind-session-device.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) 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"); } } -- 2.30.2