changeset 5853:a6e83ac70af9

Reduced difference between the send chain functions. No functional changes. This follows the change from ad137a80919f.
author Valentin Bartenev <vbart@nginx.com>
date Wed, 13 Aug 2014 15:11:45 +0400
parents 43512a33e8f2
children b63e829621ab
files src/os/unix/ngx_writev_chain.c src/os/win32/ngx_wsasend_chain.c
diffstat 2 files changed, 11 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- 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;
     }
 }
--- 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;
 }