nginx-0.0.1-2003-03-11-23:38:13 import

1 files changed, 22 insertions, 27 deletions

diff --git a/src/core/ngx_hunk.c b/src/core/ngx_hunk.c
index e1e960fd3..fe26a3329 100644
--- a/src/core/ngx_hunk.c
+++ b/src/core/ngx_hunk.c
@@ -10,16 +10,14 @@ ngx_hunk_t *ngx_create_temp_hunk(ngx_pool_t *pool, int size,
 
     ngx_test_null(h, ngx_palloc(pool, sizeof(ngx_hunk_t)), NULL);
 
-#if !(HAVE_OFFSET_EQUAL_PTR)
-    h->pos.file = h->last.file = 0;
-#endif
-
     ngx_test_null(h->pre_start, ngx_palloc(pool, size + before + after), NULL);
-    h->start = h->pos.mem = h->last.mem = h->pre_start + before;
-    h->end = h->last.mem + size;
+
+    h->start = h->pos = h->last = h->pre_start + before;
+    h->file_pos = h->file_last = 0;
+    h->end = h->last + size;
     h->post_end = h->end + after;
 
-    h->type = NGX_HUNK_TEMP;
+    h->type = NGX_HUNK_TEMP|NGX_HUNK_IN_MEMORY;
     h->tag = 0;
     h->file = NULL;
 
@@ -32,26 +30,24 @@ ngx_hunk_t *ngx_create_hunk_before(ngx_pool_t *pool, ngx_hunk_t *hunk, int size)
 
     ngx_test_null(h, ngx_palloc(pool, sizeof(ngx_hunk_t)), NULL);
 
-#if !(HAVE_OFFSET_EQUAL_PTR)
-    h->pos.file = h->last.file = 0;
-#endif
- 
-    if (hunk->type & NGX_HUNK_TEMP && hunk->pos.mem - hunk->pre_start >= size) {
+    if (hunk->type & NGX_HUNK_TEMP && hunk->pos - hunk->pre_start >= size) {
         /* keep hunk->start unchanged - used in restore */
         h->pre_start = hunk->pre_start;
-        h->end = h->post_end = hunk->pre_start = hunk->pos.mem;
-        h->start = h->pos.mem = h->last.mem = h->end - size;
+        h->end = h->post_end = hunk->pre_start = hunk->pos;
+        h->start = h->pos = h->last = h->end - size;
+        h->file_pos = h->file_last = 0;
 
-        h->type = NGX_HUNK_TEMP;
+        h->type = NGX_HUNK_TEMP|NGX_HUNK_IN_MEMORY;
         h->tag = 0;
         h->file = NULL;
 
     } else {
         ngx_test_null(h->pre_start, ngx_palloc(pool, size), NULL);
-        h->start = h->pos.mem = h->last.mem = h->pre_start; 
+        h->start = h->pos = h->last = h->pre_start; 
         h->end = h->post_end = h->start + size;
+        h->file_pos = h->file_last = 0;
 
-        h->type = NGX_HUNK_TEMP;
+        h->type = NGX_HUNK_TEMP|NGX_HUNK_IN_MEMORY;
         h->tag = 0;
         h->file = NULL;
     }
@@ -65,27 +61,26 @@ ngx_hunk_t *ngx_create_hunk_after(ngx_pool_t *pool, ngx_hunk_t *hunk, int size)
 
     ngx_test_null(h, ngx_palloc(pool, sizeof(ngx_hunk_t)), NULL);
 
-#if !(HAVE_OFFSET_EQUAL_PTR)
-    h->pos.file = h->last.file = 0;
-#endif
-
     if (hunk->type & NGX_HUNK_TEMP
-        && hunk->last.mem == hunk->end
+        && hunk->last == hunk->end
         && hunk->post_end - hunk->end >= size)
     {
         h->post_end = hunk->post_end;
-        h->pre_start = h->start = h->pos.mem = h->last.mem = hunk->post_end =
-                                                                hunk->last.mem;
-        h->type = NGX_HUNK_TEMP;
+        h->pre_start = h->start = h->pos = h->last = hunk->post_end =
+                                                                hunk->last;
+        h->file_pos = h->file_last = 0;
+
+        h->type = NGX_HUNK_TEMP|NGX_HUNK_IN_MEMORY;
         h->tag = 0;
         h->file = NULL;
 
     } else {
         ngx_test_null(h->pre_start, ngx_palloc(pool, size), NULL);
-        h->start = h->pos.mem = h->last.mem = h->pre_start; 
+        h->start = h->pos = h->last = h->pre_start; 
         h->end = h->post_end = h->start + size;
+        h->file_pos = h->file_last = 0;
 
-        h->type = NGX_HUNK_TEMP;
+        h->type = NGX_HUNK_TEMP|NGX_HUNK_IN_MEMORY;
         h->tag = 0;
         h->file = NULL;
     }