From 773287e74531d4e1e0ed5486b802b7ebcfd38fdf Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 25 Jan 2021 17:05:00 +1000 Subject: tools/record: use a pointer to the signalfd poll entry No functional changes, this makes the code slightly more readable, especially once we start adding more "special" fds. Signed-off-by: Peter Hutterer --- tools/libinput-record.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'tools') diff --git a/tools/libinput-record.c b/tools/libinput-record.c index 73567508..e64f56d5 100644 --- a/tools/libinput-record.c +++ b/tools/libinput-record.c @@ -2115,6 +2115,7 @@ mainloop(struct record_context *ctx) { bool autorestart = (ctx->timeout > 0); struct pollfd fds[ctx->ndevices + 2]; + struct pollfd *signal_fd = &fds[0]; unsigned int nfds = 0; struct record_device *d = NULL; sigset_t mask; @@ -2135,8 +2136,8 @@ mainloop(struct record_context *ctx) }; } - fds[0].fd = signalfd(-1, &mask, SFD_NONBLOCK); - assert(fds[0].fd != -1); + signal_fd->fd = signalfd(-1, &mask, SFD_NONBLOCK); + assert(signal_fd->fd != -1); nfds++; if (ctx->libinput) { @@ -2218,7 +2219,7 @@ mainloop(struct record_context *ctx) } - if (fds[0].revents != 0) { /* signal */ + if (signal_fd->revents != 0) { /* signal */ autorestart = false; break; } @@ -2295,7 +2296,7 @@ mainloop(struct record_context *ctx) ctx->output_file = NULL; } while (autorestart); - close(fds[0].fd); + close(signal_fd->fd); sigprocmask(SIG_UNBLOCK, &mask, NULL); -- cgit v1.2.3