fdo-mirrors/libevdev
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libevdev/libevdev.git synced 2025-12-20 17:20:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Localize two variables

Browse source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2020-02-13 08:28:32 +10:00
parent 6430694715
commit 50ebda0263
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libevdev/libevdev.c
View file

@ -658,7 +658,6 @@ sync_mt_state(struct libevdev *dev, int create_events)
{ {
struct input_absinfo abs_info; struct input_absinfo abs_info;
int rc; int rc;
int axis, slot;
int last_reported_slot = 0; int last_reported_slot = 0;
unsigned long slot_update[dev->num_slots][NLONGS(ABS_CNT)]; unsigned long slot_update[dev->num_slots][NLONGS(ABS_CNT)];
unsigned long tracking_id_changes[NLONGS(dev->num_slots)]; unsigned long tracking_id_changes[NLONGS(dev->num_slots)];
@ -668,7 +667,7 @@ sync_mt_state(struct libevdev *dev, int create_events)
memset(slot_update, 0, sizeof(slot_update)); memset(slot_update, 0, sizeof(slot_update));
memset(tracking_id_changes, 0, sizeof(tracking_id_changes)); memset(tracking_id_changes, 0, sizeof(tracking_id_changes));
for (axis = ABS_MT_MIN; axis <= ABS_MT_MAX; axis++) { for (int axis = ABS_MT_MIN; axis <= ABS_MT_MAX; axis++) {
/* EVIOCGMTSLOTS required format */ /* EVIOCGMTSLOTS required format */
struct mt_sync_state { struct mt_sync_state {
uint32_t code; uint32_t code;
@ -686,7 +685,7 @@ sync_mt_state(struct libevdev *dev, int create_events)
if (rc < 0) if (rc < 0)
goto out; goto out;
for (slot = 0; slot < dev->num_slots; slot++) { for (int slot = 0; slot < dev->num_slots; slot++) {
if (*slot_value(dev, slot, axis) == mt_state.val[slot]) if (*slot_value(dev, slot, axis) == mt_state.val[slot])
continue; continue;
@ -711,7 +710,7 @@ sync_mt_state(struct libevdev *dev, int create_events)
} }
if (need_tracking_id_changes) { if (need_tracking_id_changes) {
for (slot = 0; slot < dev->num_slots; slot++) { for (int slot = 0; slot < dev->num_slots; slot++) {
if (!bit_is_set(tracking_id_changes, slot)) if (!bit_is_set(tracking_id_changes, slot))
continue; continue;
@ -724,14 +723,14 @@ sync_mt_state(struct libevdev *dev, int create_events)
queue_push_event(dev, EV_SYN, SYN_REPORT, 0); queue_push_event(dev, EV_SYN, SYN_REPORT, 0);
} }
for (slot = 0; slot < dev->num_slots; slot++) { for (int slot = 0; slot < dev->num_slots; slot++) {
if (!bit_is_set(slot_update[slot], ABS_MT_SLOT)) if (!bit_is_set(slot_update[slot], ABS_MT_SLOT))
continue; continue;
queue_push_event(dev, EV_ABS, ABS_MT_SLOT, slot); queue_push_event(dev, EV_ABS, ABS_MT_SLOT, slot);
last_reported_slot = slot; last_reported_slot = slot;
for (axis = ABS_MT_MIN; axis <= ABS_MT_MAX; axis++) { for (int axis = ABS_MT_MIN; axis <= ABS_MT_MAX; axis++) {
if (axis == ABS_MT_SLOT || if (axis == ABS_MT_SLOT ||
!libevdev_has_event_code(dev, EV_ABS, axis)) !libevdev_has_event_code(dev, EV_ABS, axis))
continue; continue;