Rewrite libevdev_is_event_code to avoid signed/unsigned comparison

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/libevdev/libevdev.c b/libevdev/libevdev.c
index fbfd8f071937270e6fa161a46ccd596ade2090e6..61795f6489f088dc4e80a4422a030580cfa3972a 100644 (file)
--- a/libevdev/libevdev.c
+++ b/libevdev/libevdev.c
@@ -1172,10 +1172,13 @@ libevdev_is_event_type(const struct input_event *ev, unsigned int type)
 int
 libevdev_is_event_code(const struct input_event *ev, unsigned int type, unsigned int code)
 {
-       return type < EV_MAX &&
-               ev->type == type &&
-               (type == EV_SYN || code <= libevdev_get_event_type_max(type)) &&
-               ev->code == code;
+       int max;
+
+       if (!libevdev_is_event_type(ev, type))
+               return 0;
+
+       max = libevdev_get_event_type_max(type);
+       return (max > -1 && code <= (unsigned int)max && ev->code == code);
 }
 
 const char*