nginx-0.0.3-2004-05-28-19:49:23 import; rename ngx_hunk_t to ngx_buf_t

3 files changed, 33 insertions, 33 deletions

diff --git a/src/os/win32/ngx_files.c b/src/os/win32/ngx_files.c
index 20713ce9a..2185dcf5a 100644
--- a/src/os/win32/ngx_files.c
+++ b/src/os/win32/ngx_files.c
@@ -139,15 +139,15 @@ ssize_t ngx_write_chain_to_file(ngx_file_t *file, ngx_chain_t *cl,
     total = 0;
 
     while (cl) {
-        buf = cl->hunk->pos;
+        buf = cl->buf->pos;
         prev = buf;
         size = 0;
 
         /* coalesce the neighbouring hunks */
 
-        while (cl && prev == cl->hunk->pos) {
-            size += cl->hunk->last - cl->hunk->pos;
-            prev = cl->hunk->last;
+        while (cl && prev == cl->buf->pos) {
+            size += cl->buf->last - cl->buf->pos;
+            prev = cl->buf->last;
             cl = cl->next;
         }
 
diff --git a/src/os/win32/ngx_wsarecv_chain.c b/src/os/win32/ngx_wsarecv_chain.c
index da539281c..e417cfff6 100644
--- a/src/os/win32/ngx_wsarecv_chain.c
+++ b/src/os/win32/ngx_wsarecv_chain.c
@@ -23,20 +23,20 @@ ssize_t ngx_wsarecv_chain(ngx_connection_t *c, ngx_chain_t *chain)
 
     ngx_init_array(io, c->pool, 10, sizeof(WSABUF), NGX_ERROR);
 
-    /* coalesce the neighbouring hunks */
+    /* coalesce the neighbouring bufs */
 
     while (chain) {
-        if (prev == chain->hunk->last) {
-            wsabuf->len += chain->hunk->end - chain->hunk->last;
+        if (prev == chain->buf->last) {
+            wsabuf->len += chain->buf->end - chain->buf->last;
 
         } else {
             ngx_test_null(wsabuf, ngx_push_array(&io), NGX_ERROR);
-            wsabuf->buf = (char *) chain->hunk->last;
-            wsabuf->len = chain->hunk->end - chain->hunk->last;
+            wsabuf->buf = (char *) chain->buf->last;
+            wsabuf->len = chain->buf->end - chain->buf->last;
         }
 
-        size += chain->hunk->end - chain->hunk->last;
-        prev = chain->hunk->end;
+        size += chain->buf->end - chain->buf->last;
+        prev = chain->buf->end;
         chain = chain->next;
     }
 
diff --git a/src/os/win32/ngx_wsasend_chain.c b/src/os/win32/ngx_wsasend_chain.c
index 198e2b4c8..46e03da65 100644
--- a/src/os/win32/ngx_wsasend_chain.c
+++ b/src/os/win32/ngx_wsasend_chain.c
@@ -36,15 +36,15 @@ ngx_chain_t *ngx_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in)
 
     for (cl = in; cl; cl = cl->next) {
 
-        if (prev == cl->hunk->pos) {
-            wsabuf->len += cl->hunk->last - cl->hunk->pos;
-            prev = cl->hunk->last;
+        if (prev == cl->buf->pos) {
+            wsabuf->len += cl->buf->last - cl->buf->pos;
+            prev = cl->buf->last;
 
         } else {
             ngx_test_null(wsabuf, ngx_push_array(&wsabufs), NGX_CHAIN_ERROR);
-            wsabuf->buf = (char *) cl->hunk->pos;
-            wsabuf->len = cl->hunk->last - cl->hunk->pos;
-            prev = cl->hunk->last;
+            wsabuf->buf = (char *) cl->buf->pos;
+            wsabuf->len = cl->buf->last - cl->buf->pos;
+            prev = cl->buf->last;
         }
     }
 
@@ -72,20 +72,20 @@ ngx_chain_t *ngx_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in)
 
     for (cl = in; cl && sent > 0; cl = cl->next) {
 
-        size = cl->hunk->last - cl->hunk->pos;
+        size = cl->buf->last - cl->buf->pos;
 
         if (sent >= size) {
             sent -= size;
 
-            if (cl->hunk->type & NGX_HUNK_IN_MEMORY) {
-                cl->hunk->pos = cl->hunk->last;
+            if (ngx_buf_in_memory(cl->buf)) {
+                cl->buf->pos = cl->buf->last;
             }
 
             continue;
         }
 
-        if (cl->hunk->type & NGX_HUNK_IN_MEMORY) {
-            cl->hunk->pos += sent;
+        if (ngx_buf_in_memory(cl->buf)) {
+            cl->buf->pos += sent;
         }
 
         break;
@@ -136,16 +136,16 @@ ngx_chain_t *ngx_overlapped_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in)
 
         for (cl = in; cl; cl = cl->next) {
 
-            if (prev == cl->hunk->pos) {
-                wsabuf->len += cl->hunk->last - cl->hunk->pos;
-                prev = cl->hunk->last;
+            if (prev == cl->buf->pos) {
+                wsabuf->len += cl->buf->last - cl->buf->pos;
+                prev = cl->buf->last;
  
             } else {
                 ngx_test_null(wsabuf, ngx_push_array(&wsabufs),
                               NGX_CHAIN_ERROR);
-                wsabuf->buf = (char *) cl->hunk->pos;
-                wsabuf->len = cl->hunk->last - cl->hunk->pos;
-                prev = cl->hunk->last;
+                wsabuf->buf = (char *) cl->buf->pos;
+                wsabuf->len = cl->buf->last - cl->buf->pos;
+                prev = cl->buf->last;
             }
         }
 
@@ -213,20 +213,20 @@ ngx_chain_t *ngx_overlapped_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in)
 
     for (cl = in; cl && sent > 0; cl = cl->next) {
 
-        size = cl->hunk->last - cl->hunk->pos;
+        size = cl->buf->last - cl->buf->pos;
 
         if (sent >= size) {
             sent -= size;
 
-            if (cl->hunk->type & NGX_HUNK_IN_MEMORY) {
-                cl->hunk->pos = cl->hunk->last;
+            if (ngx_buf_in_memory(cl->buf)) {
+                cl->buf->pos = cl->buf->last;
             }
 
             continue;
         }
 
-        if (cl->hunk->type & NGX_HUNK_IN_MEMORY) {
-            cl->hunk->pos += sent;
+        if (ngx_buf_in_memory(cl->buf)) {
+            cl->buf->pos += sent;
         }
 
         break;