diff options
-rw-r--r-- | miscutils/microcom.c | 4 | ||||
-rw-r--r-- | networking/httpd.c | 6 | ||||
-rw-r--r-- | networking/telnet.c | 4 | ||||
-rw-r--r-- | util-linux/script.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/miscutils/microcom.c b/miscutils/microcom.c index 9a7a41d53..0fb51d2e8 100644 --- a/miscutils/microcom.c +++ b/miscutils/microcom.c | |||
@@ -119,7 +119,7 @@ int microcom_main(int argc UNUSED_PARAM, char **argv) | |||
119 | nfd = 2; | 119 | nfd = 2; |
120 | // Not safe_poll: we want to exit on signal | 120 | // Not safe_poll: we want to exit on signal |
121 | while (!bb_got_signal && poll(pfd, nfd, timeout) > 0) { | 121 | while (!bb_got_signal && poll(pfd, nfd, timeout) > 0) { |
122 | if (nfd > 1 && (pfd[1].revents & POLLIN)) { | 122 | if (nfd > 1 && pfd[1].revents) { |
123 | char c; | 123 | char c; |
124 | // read from stdin -> write to device | 124 | // read from stdin -> write to device |
125 | if (safe_read(STDIN_FILENO, &c, 1) < 1) { | 125 | if (safe_read(STDIN_FILENO, &c, 1) < 1) { |
@@ -143,7 +143,7 @@ int microcom_main(int argc UNUSED_PARAM, char **argv) | |||
143 | safe_poll(pfd, 1, delay); | 143 | safe_poll(pfd, 1, delay); |
144 | skip_write: ; | 144 | skip_write: ; |
145 | } | 145 | } |
146 | if (pfd[0].revents & POLLIN) { | 146 | if (pfd[0].revents) { |
147 | #define iobuf bb_common_bufsiz1 | 147 | #define iobuf bb_common_bufsiz1 |
148 | ssize_t len; | 148 | ssize_t len; |
149 | // read from device -> write to stdout | 149 | // read from device -> write to stdout |
diff --git a/networking/httpd.c b/networking/httpd.c index 5bbc7ee85..8834c1c71 100644 --- a/networking/httpd.c +++ b/networking/httpd.c | |||
@@ -1167,7 +1167,7 @@ static NOINLINE void cgi_io_loop_and_exit(int fromCgi_rd, int toCgi_wr, int post | |||
1167 | break; | 1167 | break; |
1168 | } | 1168 | } |
1169 | 1169 | ||
1170 | if (pfd[TO_CGI].revents & POLLOUT) { | 1170 | if (pfd[TO_CGI].revents) { |
1171 | /* hdr_cnt > 0 here due to the way pfd[TO_CGI].events set */ | 1171 | /* hdr_cnt > 0 here due to the way pfd[TO_CGI].events set */ |
1172 | /* Have data from peer and can write to CGI */ | 1172 | /* Have data from peer and can write to CGI */ |
1173 | count = safe_write(toCgi_wr, hdr_ptr, hdr_cnt); | 1173 | count = safe_write(toCgi_wr, hdr_ptr, hdr_cnt); |
@@ -1184,7 +1184,7 @@ static NOINLINE void cgi_io_loop_and_exit(int fromCgi_rd, int toCgi_wr, int post | |||
1184 | } | 1184 | } |
1185 | } | 1185 | } |
1186 | 1186 | ||
1187 | if (pfd[0].revents & POLLIN) { | 1187 | if (pfd[0].revents) { |
1188 | /* post_len > 0 && hdr_cnt == 0 here */ | 1188 | /* post_len > 0 && hdr_cnt == 0 here */ |
1189 | /* We expect data, prev data portion is eaten by CGI | 1189 | /* We expect data, prev data portion is eaten by CGI |
1190 | * and there *is* data to read from the peer | 1190 | * and there *is* data to read from the peer |
@@ -1202,7 +1202,7 @@ static NOINLINE void cgi_io_loop_and_exit(int fromCgi_rd, int toCgi_wr, int post | |||
1202 | } | 1202 | } |
1203 | } | 1203 | } |
1204 | 1204 | ||
1205 | if (pfd[FROM_CGI].revents & POLLIN) { | 1205 | if (pfd[FROM_CGI].revents) { |
1206 | /* There is something to read from CGI */ | 1206 | /* There is something to read from CGI */ |
1207 | char *rbuf = iobuf; | 1207 | char *rbuf = iobuf; |
1208 | 1208 | ||
diff --git a/networking/telnet.c b/networking/telnet.c index 344bb0daa..09f75cc84 100644 --- a/networking/telnet.c +++ b/networking/telnet.c | |||
@@ -618,7 +618,7 @@ int telnet_main(int argc UNUSED_PARAM, char **argv) | |||
618 | default: | 618 | default: |
619 | 619 | ||
620 | #ifdef USE_POLL | 620 | #ifdef USE_POLL |
621 | if (ufds[0].revents & POLLIN) | 621 | if (ufds[0].revents) |
622 | #else | 622 | #else |
623 | if (FD_ISSET(STDIN_FILENO, &rfds)) | 623 | if (FD_ISSET(STDIN_FILENO, &rfds)) |
624 | #endif | 624 | #endif |
@@ -631,7 +631,7 @@ int telnet_main(int argc UNUSED_PARAM, char **argv) | |||
631 | } | 631 | } |
632 | 632 | ||
633 | #ifdef USE_POLL | 633 | #ifdef USE_POLL |
634 | if (ufds[1].revents & POLLIN) | 634 | if (ufds[1].revents) |
635 | #else | 635 | #else |
636 | if (FD_ISSET(netfd, &rfds)) | 636 | if (FD_ISSET(netfd, &rfds)) |
637 | #endif | 637 | #endif |
diff --git a/util-linux/script.c b/util-linux/script.c index 37213eec8..d9a62fbfe 100644 --- a/util-linux/script.c +++ b/util-linux/script.c | |||
@@ -119,7 +119,7 @@ int script_main(int argc UNUSED_PARAM, char **argv) | |||
119 | * for example, try "script -c true" */ | 119 | * for example, try "script -c true" */ |
120 | break; | 120 | break; |
121 | } | 121 | } |
122 | if (pfd[0].revents & POLLIN) { | 122 | if (pfd[0].revents) { |
123 | errno = 0; | 123 | errno = 0; |
124 | count = safe_read(pty, buf, sizeof(buf)); | 124 | count = safe_read(pty, buf, sizeof(buf)); |
125 | if (count <= 0 && errno != EAGAIN) { | 125 | if (count <= 0 && errno != EAGAIN) { |
@@ -143,7 +143,7 @@ int script_main(int argc UNUSED_PARAM, char **argv) | |||
143 | } | 143 | } |
144 | } | 144 | } |
145 | } | 145 | } |
146 | if (pfd[1].revents & POLLIN) { | 146 | if (pfd[1].revents) { |
147 | count = safe_read(STDIN_FILENO, buf, sizeof(buf)); | 147 | count = safe_read(STDIN_FILENO, buf, sizeof(buf)); |
148 | if (count <= 0) { | 148 | if (count <= 0) { |
149 | /* err/eof from stdin: don't read stdin anymore */ | 149 | /* err/eof from stdin: don't read stdin anymore */ |