diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2014-04-07 15:01:44 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2014-04-24 08:17:01 +1000 |
| commit | 8b01184404dafb0dc121a1cdef066ea78ba6d21c (patch) | |
| tree | 030f612e588a5b76f41bab17213811955fcb8c8a /libevdev/libevdev.c | |
| parent | 1c425e9837b9e9b5e1f5ebdad5393418a2473840 (diff) | |
| download | libevdev-8b01184404dafb0dc121a1cdef066ea78ba6d21c.tar.gz | |
Move read_more_events() up in the file
No functional change
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Diffstat (limited to 'libevdev/libevdev.c')
| -rw-r--r-- | libevdev/libevdev.c | 50 |
1 files 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 @@ -702,6 +702,31 @@ out: } 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) { int i; @@ -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. */ |
