diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-12 12:29:55 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-12 12:29:55 +0100 |
commit | cb23d93c6845df3f2733a32caa4194e60ef871a7 (patch) | |
tree | 3df3fae13c62eea184d61ceaed25a4fdf85c809c /networking/httpd.c | |
parent | 385cc59117f2788d24d2cd75fd58f7ff044d501c (diff) | |
download | busybox-w32-cb23d93c6845df3f2733a32caa4194e60ef871a7.tar.gz busybox-w32-cb23d93c6845df3f2733a32caa4194e60ef871a7.tar.bz2 busybox-w32-cb23d93c6845df3f2733a32caa4194e60ef871a7.zip |
*: add/remove safe_, it seems we had a few incorrect uses
function old new delta
chat_main 1359 1361 +2
microcom_main 712 713 +1
ifplugd_main 1109 1110 +1
arpping 465 466 +1
acpid_main 440 441 +1
script_main 1069 1067 -2
cgi_io_loop_and_exit 594 591 -3
telnet_main 1475 1469 -6
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 5/3 up/down: 6/-11) Total: -5 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking/httpd.c')
-rw-r--r-- | networking/httpd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/networking/httpd.c b/networking/httpd.c index 0a8322c88..227803abf 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) { | 1170 | if (pfd[TO_CGI].revents & POLLOUT) { |
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) { | 1187 | if (pfd[0].revents & POLLIN) { |
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) { | 1205 | if (pfd[FROM_CGI].revents & POLLIN) { |
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 | ||