# HG changeset patch # User Valentin Bartenev # Date 1407928305 -14400 # Node ID a6e83ac70af9acf4ef0ad55d86b61ce07ce55c5d # Parent 43512a33e8f232fb6f256b90e76ac4f1472a0c1f Reduced difference between the send chain functions. No functional changes. This follows the change from ad137a80919f. diff --git a/src/os/unix/ngx_writev_chain.c b/src/os/unix/ngx_writev_chain.c --- a/src/os/unix/ngx_writev_chain.c +++ b/src/os/unix/ngx_writev_chain.c @@ -138,7 +138,7 @@ ngx_writev_chain(ngx_connection_t *c, ng c->sent += sent; - cl = ngx_handle_sent_chain(in, sent); + in = ngx_handle_sent_chain(in, sent); if (eintr) { continue; @@ -146,13 +146,11 @@ ngx_writev_chain(ngx_connection_t *c, ng if (send - prev_send != sent) { wev->ready = 0; - return cl; + return in; } - if (send >= limit || cl == NULL) { - return cl; + if (send >= limit || in == NULL) { + return in; } - - in = cl; } } diff --git a/src/os/win32/ngx_wsasend_chain.c b/src/os/win32/ngx_wsasend_chain.c --- a/src/os/win32/ngx_wsasend_chain.c +++ b/src/os/win32/ngx_wsasend_chain.c @@ -113,18 +113,16 @@ ngx_wsasend_chain(ngx_connection_t *c, n c->sent += sent; - cl = ngx_handle_sent_chain(in, sent); + in = ngx_handle_sent_chain(in, sent); if (send - prev_send != sent) { wev->ready = 0; - return cl; + return in; } - if (send >= limit || cl == NULL) { - return cl; + if (send >= limit || in == NULL) { + return in; } - - in = cl; } } @@ -280,14 +278,14 @@ ngx_overlapped_wsasend_chain(ngx_connect c->sent += sent; - cl = ngx_handle_sent_chain(in, sent); + in = ngx_handle_sent_chain(in, sent); - if (cl) { + if (in) { wev->ready = 0; } else { wev->ready = 1; } - return cl; + return in; }