aboutsummaryrefslogtreecommitdiff
path: root/src/os/unix/ngx_solaris_sendfilev_chain.c
diff options
context:
space:
mode:
authorValentin Bartenev <vbart@nginx.com>2014-08-13 15:11:45 +0400
committerValentin Bartenev <vbart@nginx.com>2014-08-13 15:11:45 +0400
commit77d61350a4ac83166555b140e0995c57dcffd696 (patch)
tree8d1cc18b76ce6decf004a53de504f82e5f2fcb96 /src/os/unix/ngx_solaris_sendfilev_chain.c
parent4aac91049f8909e928580f9fb8b752ba748f4167 (diff)
downloadnginx-77d61350a4ac83166555b140e0995c57dcffd696.tar.gz
nginx-77d61350a4ac83166555b140e0995c57dcffd696.zip
Removed the "complete" variable from various send chain functions.
It was made redundant by the previous change, since the "sent" variable is no longer modified.
Diffstat (limited to 'src/os/unix/ngx_solaris_sendfilev_chain.c')
-rw-r--r--src/os/unix/ngx_solaris_sendfilev_chain.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/os/unix/ngx_solaris_sendfilev_chain.c b/src/os/unix/ngx_solaris_sendfilev_chain.c
index 76e8728e4..1afe5ac19 100644
--- a/src/os/unix/ngx_solaris_sendfilev_chain.c
+++ b/src/os/unix/ngx_solaris_sendfilev_chain.c
@@ -51,7 +51,7 @@ ngx_solaris_sendfilev_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
off_t size, send, prev_send, aligned, fprev;
size_t sent;
ssize_t n;
- ngx_int_t eintr, complete;
+ ngx_int_t eintr;
ngx_err_t err;
sendfilevec_t *sfv, sfvs[NGX_SENDFILEVECS];
ngx_array_t vec;
@@ -89,7 +89,6 @@ ngx_solaris_sendfilev_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
fprev = 0;
sfv = NULL;
eintr = 0;
- complete = 0;
sent = 0;
prev_send = send;
@@ -201,10 +200,6 @@ ngx_solaris_sendfilev_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, c->log, 0,
"sendfilev: %z %z", n, sent);
- if (send - prev_send == (off_t) sent) {
- complete = 1;
- }
-
c->sent += sent;
in = ngx_handle_sent_chain(in, sent);
@@ -213,7 +208,7 @@ ngx_solaris_sendfilev_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
continue;
}
- if (!complete) {
+ if (send - prev_send != (off_t) sent) {
wev->ready = 0;
return in;
}