[systemd-commits] src/libsystemd-terminal

David Herrmann dvdhrm at kemper.freedesktop.org
Tue Sep 16 14:02:05 PDT 2014


 src/libsystemd-terminal/idev-evdev.c |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 1164e944d9689c3e94c100a634fb5a404662e247
Author: David Herrmann <dh.herrmann at gmail.com>
Date:   Tue Sep 16 23:00:26 2014 +0200

    terminal: remove dead code checking O_WRONLY
    
    We only reject evdev FDs that are O_WRONLY as they're currently pretty
    useless. The following check for O_WRONLY is thus never excercised so drop
    it.
    Thanks to Thomas Andersen (via coverity)!

diff --git a/src/libsystemd-terminal/idev-evdev.c b/src/libsystemd-terminal/idev-evdev.c
index 6509d10..18c48ee 100644
--- a/src/libsystemd-terminal/idev-evdev.c
+++ b/src/libsystemd-terminal/idev-evdev.c
@@ -314,11 +314,7 @@ static int idev_evdev_resume(idev_evdev *evdev, int dev_fd) {
                 return -EACCES;
 
         evdev->element.readable = true;
-        evdev->element.writable = true;
-        if (flags == O_RDONLY)
-                evdev->element.writable = false;
-        else if (flags == O_WRONLY)
-                evdev->element.readable = false;
+        evdev->element.writable = !(flags & O_RDONLY);
 
         /*
          * TODO: We *MUST* re-sync the device so we get a delta of the changed



More information about the systemd-commits mailing list