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

tools/record: initialize all pollfds in the same loop

Browse source 
Minor tidying up the code, set the default values for all fds in the same loop
instead of having it split to wherever the fd is created.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2021-01-25 15:56:03 +10:00
parent 1dbdef8fdb
commit f2133ef0f3
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tools/libinput-record.c
View file

@ -2129,24 +2129,26 @@ mainloop(struct record_context *ctx)
sigaddset(&mask, SIGQUIT);
sigprocmask(SIG_BLOCK, &mask, NULL);
for (size_t i = 0; i < ARRAY_LENGTH(fds); i++) {
fds[i] = (struct pollfd) {
.fd = -1,
.events = POLLIN,
.revents = 0,
};
}
fds[0].fd = signalfd(-1, &mask, SFD_NONBLOCK);
fds[0].events = POLLIN;
fds[0].revents = 0;
assert(fds[0].fd != -1);
nfds++;
if (ctx->libinput) {
fds[1].fd = libinput_get_fd(ctx->libinput);
fds[1].events = POLLIN;
fds[1].revents = 0;
nfds++;
assert(nfds == 2);
}
list_for_each(d, &ctx->devices, link) {
fds[nfds].fd = libevdev_get_fd(d->evdev);
fds[nfds].events = POLLIN;
fds[nfds].revents = 0;
assert(fds[nfds].fd != -1);
nfds++;
}