diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2013-08-29 11:53:59 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2013-08-29 13:20:07 +1000 |
| commit | 1b7c46b2f16f22bb87e76e55c28a717f5f8f248f (patch) | |
| tree | 1aeb144edfc9465b48008f19aac009d6a38fae6e /libevdev | |
| parent | 30a65d20e9aef9af107ecfede4b04518d3e87588 (diff) | |
| download | libevdev-1b7c46b2f16f22bb87e76e55c28a717f5f8f248f.tar.gz | |
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>
Diffstat (limited to 'libevdev')
| -rw-r--r-- | libevdev/libevdev-int.h | 2 | ||||
| -rw-r--r-- | libevdev/libevdev.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libevdev/libevdev-int.h b/libevdev/libevdev-int.h index 2be555d..61c2454 100644 --- 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 598455e..95d041c 100644 --- 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) |