summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2021-01-25 17:05:00 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2021-01-29 07:31:46 +1000
commit773287e74531d4e1e0ed5486b802b7ebcfd38fdf (patch)
tree6df4b80e595c1098f4658ce8e9a67ee48bb1f4f1 /tools
parentb1f8ea0a5ef26ed462e1d33cee044963b6e55f13 (diff)
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 <peter.hutterer@who-t.net>
Diffstat (limited to 'tools')
-rw-r--r--tools/libinput-record.c9
1 files changed, 5 insertions, 4 deletions
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);