tools/record: initialize all pollfds in the same loop
authorPeter Hutterer <peter.hutterer@who-t.net>
Mon, 25 Jan 2021 05:56:03 +0000 (15:56 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Thu, 28 Jan 2021 21:31:46 +0000 (07:31 +1000)
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>
tools/libinput-record.c

index ecbf6e44c44e67bd5bb0a1209cabae8298279302..b9f8f13a27b50db481745ae117d1395cf2e84b97 100644 (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++;
        }