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

udev: don't init the quirks until we checked all arguments

Browse source 
If we fail with an invalid argument, there's no need to initialize all the
quirks beforehand.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2019-06-06 10:29:35 +10:00
parent 90216a010a
commit a3ea7a6808
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/udev-seat.c
View file

@ -391,13 +391,6 @@ libinput_udev_assign_seat(struct libinput *libinput,
return -1;
}
/* We cannot do this during udev_create_context because the log
* handler isn't set up there but we really want to log to the right
* place if the quirks run into parser errors. So we have to do it
* here since we can expect the log handler to be set up by now.
*/
libinput_init_quirks(libinput);
if (libinput->interface_backend != &interface_backend) {
log_bug_client(libinput, "Mismatching backends.\n");
return -1;
@ -406,6 +399,13 @@ libinput_udev_assign_seat(struct libinput *libinput,
if (input->seat_id != NULL)
return -1;
/* We cannot do this during udev_create_context because the log
* handler isn't set up there but we really want to log to the right
* place if the quirks run into parser errors. So we have to do it
* here since we can expect the log handler to be set up by now.
*/
libinput_init_quirks(libinput);
input->seat_id = safe_strdup(seat_id);
if (udev_input_enable(&input->base) < 0)