fdo-mirrors/libei
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libei.git synced 2026-01-04 12:00:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

eis: switch to a goto out approach

Browse source 
Makes the code a bit easier to follow
This commit is contained in:
Peter Hutterer 2023-02-06 11:38:45 +10:00
parent 964bb76c60
commit e2a45dad38
1 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/libeis-device.c
View file

@ -384,26 +384,42 @@ eis_device_add(struct eis_device *device)
eis_client_register_object(client, &device->proto_object);
eis_seat_event_device(seat, device->proto_object.id, device->proto_object.version);
int rc = eis_device_event_name(device, device->name);
if (rc == 0)
rc = eis_device_event_capabilities(device, device->capabilities);
if (rc == 0)
rc = eis_device_event_type(device, device->type);
if (rc == 0 && device->type == EIS_DEVICE_TYPE_PHYSICAL)
if (rc < 0)
goto out;
rc = eis_device_event_capabilities(device, device->capabilities);
if (rc < 0)
goto out;
rc = eis_device_event_type(device, device->type);
if (rc < 0)
goto out;
if (device->type == EIS_DEVICE_TYPE_PHYSICAL) {
rc = eis_device_event_dimensions(device, device->width, device->height);
if (rc == 0 &&device->type == EIS_DEVICE_TYPE_VIRTUAL) {
if (rc < 0)
goto out;
}
if (device->type == EIS_DEVICE_TYPE_VIRTUAL) {
struct eis_region *r;
list_for_each(r, &device->regions, link) {
rc = eis_device_event_region(device, r->x, r->y, r->width, r->height, r->physical_scale);
if (rc != 0)
break;
if (rc < 0)
goto out;
}
}
if (rc >= 0 && device->keymap)
rc = eis_device_event_keymap(device, device->keymap->type, device->keymap->size, device->keymap->fd);
if (rc == 0)
eis_device_event_done(device);
if (device->keymap) {
rc = eis_device_event_keymap(device, device->keymap->type, device->keymap->size, device->keymap->fd);
if (rc < 0)
goto out;
}
rc = eis_device_event_done(device);
if (rc < 0)
goto out;
out:
/* FIXME: check rc */
return;
}
_public_ void