Return the length or a neg errno from libinput_device_get_keys()

Previous return value was the straight ioctl, we should try to avoid errno
mangling.

This changes the API, if not the ABI. Callers with code along the lines of
if (libinput_device_get_keys() == -1) will now break.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jonas Ådahl <jadahl@gmail.com>

diff --git a/src/evdev.c b/src/evdev.c
index 5d01e3bcf418b63563bb478c452e4f0e4eb11ec6..ba7c8b34f91536e0450c2c745a206d20b835d76d 100644 (file)
--- a/src/evdev.c
+++ b/src/evdev.c
@@ -715,8 +715,12 @@ err:
 int
 evdev_device_get_keys(struct evdev_device *device, char *keys, size_t size)
 {
+       int len;
+
        memset(keys, 0, size);
-       return ioctl(device->fd, EVIOCGKEY(size), keys);
+       len = ioctl(device->fd, EVIOCGKEY(size), keys);
+
+       return (len == -1) ? -errno : len;
 }
 
 const char *

diff --git a/src/libinput.h b/src/libinput.h
index 9a9cd8c4aba6928290251db3869b2fe8734333b7..d6bf9f8649cd3e0ff3dfa642e59a1254f15248c6 100644 (file)
--- a/src/libinput.h
+++ b/src/libinput.h
@@ -1169,6 +1169,8 @@ libinput_device_led_update(struct libinput_device *device,
  * @param device A current input device
  * @param keys An array filled with the bitmask for the keys
  * @param size Size of the keys array
+ *
+ * @return The number of valid bytes in keys, or a negative errno on failure
  */
 int
 libinput_device_get_keys(struct libinput_device *device,