nginx-0.0.10-2004-09-06-22:45:00 import
diff --git a/src/core/ngx_array.h b/src/core/ngx_array.h index 79a86e6..848596c 100644 --- a/src/core/ngx_array.h +++ b/src/core/ngx_array.h
@@ -20,7 +20,7 @@ void *ngx_push_array(ngx_array_t *a); -ngx_inline static ngx_int_t ngx_init_array0(ngx_array_t *array, ngx_pool_t *pool, +ngx_inline static ngx_int_t ngx_array_init(ngx_array_t *array, ngx_pool_t *pool, ngx_uint_t n, size_t size) { if (!(array->elts = ngx_palloc(pool, n * size))) {
diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c index ff23642..f6ecd4a 100644 --- a/src/core/ngx_conf_file.c +++ b/src/core/ngx_conf_file.c
@@ -600,7 +600,7 @@ } } - if (!(file = ngx_push_list(&cycle->open_files))) { + if (!(file = ngx_list_push(&cycle->open_files))) { return NULL; }
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c index cc309e3..9e5143c 100644 --- a/src/core/ngx_cycle.c +++ b/src/core/ngx_cycle.c
@@ -81,7 +81,7 @@ n = 20; } - if (ngx_init_list(&cycle->open_files, pool, n, sizeof(ngx_open_file_t)) + if (ngx_list_init(&cycle->open_files, pool, n, sizeof(ngx_open_file_t)) == NGX_ERROR) { ngx_destroy_pool(pool);
diff --git a/src/core/ngx_list.c b/src/core/ngx_list.c index 10d7957..885f8f5 100644 --- a/src/core/ngx_list.c +++ b/src/core/ngx_list.c
@@ -3,7 +3,7 @@ #include <ngx_core.h> -void *ngx_push_list(ngx_list_t *l) +void *ngx_list_push(ngx_list_t *l) { void *elt; ngx_list_part_t *last;
diff --git a/src/core/ngx_list.h b/src/core/ngx_list.h index 757564f..f43f235 100644 --- a/src/core/ngx_list.h +++ b/src/core/ngx_list.h
@@ -24,7 +24,7 @@ } ngx_list_t; -ngx_inline static ngx_int_t ngx_init_list(ngx_list_t *list, ngx_pool_t *pool, +ngx_inline static ngx_int_t ngx_list_init(ngx_list_t *list, ngx_pool_t *pool, ngx_uint_t n, size_t size) { if (!(list->part.elts = ngx_palloc(pool, n * size))) { @@ -67,7 +67,7 @@ */ -void *ngx_push_list(ngx_list_t *list); +void *ngx_list_push(ngx_list_t *list); #endif /* _NGX_LIST_H_INCLUDED_ */