From 5f5a1f683285c9cc3511b872cc996f719b67d36b Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Wed, 24 Apr 2019 16:53:05 +0200 Subject: No need to clear bits in pollfd revents POSIX says: "In each pollfd structure, poll() shall clear the revents member, except that where the application requested a report on a condition by setting one of the bits of events listed above, poll() shall set the corresponding bit in revents if the requested condition is true." --- wg-dynamic-client.c | 2 -- wg-dynamic-server.c | 3 --- 2 files changed, 5 deletions(-) diff --git a/wg-dynamic-client.c b/wg-dynamic-client.c index f966747..1bef297 100644 --- a/wg-dynamic-client.c +++ b/wg-dynamic-client.c @@ -505,7 +505,6 @@ int main(int argc __attribute__((unused)), char *argv[] __attribute__((unused))) } if (pollfds[0].revents & POLLOUT) { - pollfds[0].revents &= ~POLLOUT; debug("sending, trying again with %lu bytes\n", req.buflen); off = send_message(pollfds[0].fd, req.buf, &req.buflen); @@ -516,7 +515,6 @@ int main(int argc __attribute__((unused)), char *argv[] __attribute__((unused))) } if (pollfds[0].revents & POLLIN) { - pollfds[0].revents &= ~POLLIN; if (handle_request(pollfds[0].fd, &req, handle_response, handle_error)) close_connection(&pollfds[0].fd, &req); diff --git a/wg-dynamic-server.c b/wg-dynamic-server.c index 34fe9bc..2a0c321 100644 --- a/wg-dynamic-server.c +++ b/wg-dynamic-server.c @@ -548,8 +548,6 @@ int main(int argc, char *argv[]) if (!(pollfds[i].revents & POLLOUT)) continue; - pollfds[i].revents &= ~POLLOUT; - off = send_message(pollfds[i].fd, reqs[i - 1].buf, &reqs[i - 1].buflen); if (reqs[i - 1].buflen) @@ -563,7 +561,6 @@ int main(int argc, char *argv[]) if (pollfds[i].fd < 0 || !pollfds[i].revents & POLLIN) continue; - pollfds[i].revents &= ~POLLIN; if (handle_request(pollfds[i].fd, &reqs[i - 1], send_response, send_error)) close_connection(&pollfds[i].fd, &reqs[i - 1]); -- cgit v1.2.3-59-g8ed1b