Fix two signed vs unsigned int warnings

dev->num_slots is -1 if we don't have ABS_MT_SLOT.

Set dev->grabbed to the right field type.

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

diff --git a/libevdev/libevdev-int.h b/libevdev/libevdev-int.h
index 2be555d31c7503b2a22946fbece949c25da1c1df..61c245474521ea358a05e9441f99a8b6edf2cf74 100644 (file)
--- a/libevdev/libevdev-int.h
+++ b/libevdev/libevdev-int.h
@@ -99,7 +99,7 @@ struct libevdev {
        int rep_values[REP_CNT];
 
        enum SyncState sync_state;
-       int grabbed;
+       enum libevdev_grab_mode grabbed;
 
        struct input_event *queue;
        size_t queue_size; /**< size of queue in elements */

diff --git a/libevdev/libevdev.c b/libevdev/libevdev.c
index 598455e1ec3958f3d20dec5cfd9cb43be6f8067e..95d041c0de7dc7a8b402627d62ce35dcfe5e8d9d 100644 (file)
--- a/libevdev/libevdev.c
+++ b/libevdev/libevdev.c
@@ -936,7 +936,7 @@ libevdev_set_slot_value(struct libevdev *dev, unsigned int slot, unsigned int co
        if (!libevdev_has_event_type(dev, EV_ABS) || !libevdev_has_event_code(dev, EV_ABS, code))
                return -1;
 
-       if (slot >= dev->num_slots || slot >= MAX_SLOTS)
+       if (dev->num_slots == -1 || slot >= (unsigned int)dev->num_slots || slot >= MAX_SLOTS)
                return -1;
 
        if (code > ABS_MT_MAX || code < ABS_MT_MIN)