From 8b01184404dafb0dc121a1cdef066ea78ba6d21c Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 7 Apr 2014 15:01:44 +1000 Subject: [PATCH] Move read_more_events() up in the file No functional change Signed-off-by: Peter Hutterer Reviewed-by: Benjamin Tissoires --- libevdev/libevdev.c | 50 ++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/libevdev/libevdev.c b/libevdev/libevdev.c index 34413b2..7e8d3db 100644 --- a/libevdev/libevdev.c +++ b/libevdev/libevdev.c @@ -701,6 +701,31 @@ out: return rc ? -errno : 0; } +static int +read_more_events(struct libevdev *dev) +{ + int free_elem; + int len; + struct input_event *next; + + free_elem = queue_num_free_elements(dev); + if (free_elem <= 0) + return 0; + + next = queue_next_element(dev); + len = read(dev->fd, next, free_elem * sizeof(struct input_event)); + if (len < 0) { + return -errno; + } else if (len > 0 && len % sizeof(struct input_event) != 0) + return -EINVAL; + else if (len > 0) { + int nev = len/sizeof(struct input_event); + queue_set_num_elements(dev, queue_num_elements(dev) + nev); + } + + return 0; +} + static int sync_state(struct libevdev *dev) { @@ -859,31 +884,6 @@ update_state(struct libevdev *dev, const struct input_event *e) return rc; } -static int -read_more_events(struct libevdev *dev) -{ - int free_elem; - int len; - struct input_event *next; - - free_elem = queue_num_free_elements(dev); - if (free_elem <= 0) - return 0; - - next = queue_next_element(dev); - len = read(dev->fd, next, free_elem * sizeof(struct input_event)); - if (len < 0) { - return -errno; - } else if (len > 0 && len % sizeof(struct input_event) != 0) - return -EINVAL; - else if (len > 0) { - int nev = len/sizeof(struct input_event); - queue_set_num_elements(dev, queue_num_elements(dev) + nev); - } - - return 0; -} - /** * Sanitize/modify events where needed. */ -- 2.34.1