diff options
Diffstat (limited to 'libevdev/libevdev.c')
| -rw-r--r-- | libevdev/libevdev.c | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/libevdev/libevdev.c b/libevdev/libevdev.c index dd8ab14..d2a078b 100644 --- a/libevdev/libevdev.c +++ b/libevdev/libevdev.c @@ -109,19 +109,27 @@ log_msg(enum libevdev_log_priority priority, va_end(args); } +static void +libevdev_reset(struct libevdev *dev) +{ + memset(dev, 0, sizeof(*dev)); + dev->fd = -1; + dev->num_slots = -1; + dev->current_slot = -1; + dev->grabbed = LIBEVDEV_UNGRAB; + dev->sync_state = SYNC_NONE; +} + LIBEVDEV_EXPORT struct libevdev* libevdev_new(void) { struct libevdev *dev; - dev = calloc(1, sizeof(*dev)); + dev = malloc(sizeof(*dev)); if (!dev) return NULL; - dev->fd = -1; - dev->num_slots = -1; - dev->current_slot = -1; - dev->grabbed = LIBEVDEV_UNGRAB; - dev->sync_state = SYNC_NONE; + + libevdev_reset(dev); return dev; } @@ -209,6 +217,8 @@ libevdev_set_fd(struct libevdev* dev, int fd) return -EBADF; } + libevdev_reset(dev); + rc = ioctl(fd, EVIOCGBIT(0, sizeof(dev->bits)), dev->bits); if (rc < 0) goto out; @@ -352,6 +362,8 @@ libevdev_set_fd(struct libevdev* dev, int fd) */ out: + if (rc) + libevdev_reset(dev); return rc ? -errno : 0; } |