From f2133ef0f3a72c5839a812735c156cc7521af349 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 25 Jan 2021 15:56:03 +1000 Subject: [PATCH] tools/record: initialize all pollfds in the same loop 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 --- tools/libinput-record.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tools/libinput-record.c b/tools/libinput-record.c index ecbf6e44..b9f8f13a 100644 --- a/tools/libinput-record.c +++ b/tools/libinput-record.c @@ -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++; }