31 lines
1.2 KiB
Diff
31 lines
1.2 KiB
Diff
From 1164e944d9689c3e94c100a634fb5a404662e247 Mon Sep 17 00:00:00 2001
|
|
From: David Herrmann <dh.herrmann@gmail.com>
|
|
Date: Tue, 16 Sep 2014 23:00:26 +0200
|
|
Subject: [PATCH] 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)!
|
|
---
|
|
src/libsystemd-terminal/idev-evdev.c | 6 +-----
|
|
1 file changed, 1 insertion(+), 5 deletions(-)
|
|
|
|
diff --git a/src/libsystemd-terminal/idev-evdev.c b/src/libsystemd-terminal/idev-evdev.c
|
|
index 6509d1011e..18c48ee592 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
|