diff options
author | Igor Sysoev <igor@sysoev.ru> | 2005-03-19 12:38:37 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2005-03-19 12:38:37 +0000 |
commit | c15717285d2157a603bb1b130b26d7baa549be7e (patch) | |
tree | 56dc8346b22bb2660eecd3bc086d263ac6d67326 /src/core/ngx_palloc.c | |
parent | e12fbfe82a176cd386cdcecfeabf43ac8fd870a4 (diff) | |
download | nginx-release-0.1.25.tar.gz nginx-release-0.1.25.zip |
nginx-0.1.25-RELEASE importrelease-0.1.25
*) Bugfix: nginx did run on Linux parisc.
*) Feature: nginx now does not start under FreeBSD if the sysctl
kern.ipc.somaxconn value is too big.
*) Bugfix: if a request was internally redirected by the
ngx_http_index_module module to the ngx_http_proxy_module or
ngx_http_fastcgi_module modules, then the index file was not closed
after request completion.
*) Feature: the "proxy_pass" can be used in location with regular
expression.
*) Feature: the ngx_http_rewrite_filter_module module supports the
condition like "if ($HTTP_USER_AGENT ~ MSIE)".
*) Bugfix: nginx started too slow if the large number of addresses and
text values were used in the "geo" directive.
*) Change: a variable name must be declared as "$name" in the "geo"
directive. The previous variant without "$" is still supported, but
will be removed soon.
*) Feature: the "%{VARIABLE}v" logging parameter.
*) Feature: the "set $name value" directive.
*) Bugfix: gcc 4.0 compatibility.
*) Feature: the --with-openssl-opt=OPTIONS autoconfiguration directive.
Diffstat (limited to 'src/core/ngx_palloc.c')
-rw-r--r-- | src/core/ngx_palloc.c | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/src/core/ngx_palloc.c b/src/core/ngx_palloc.c index fc6f36e83..8faf9a77e 100644 --- a/src/core/ngx_palloc.c +++ b/src/core/ngx_palloc.c @@ -8,11 +8,13 @@ #include <ngx_core.h> -ngx_pool_t *ngx_create_pool(size_t size, ngx_log_t *log) +ngx_pool_t * +ngx_create_pool(size_t size, ngx_log_t *log) { ngx_pool_t *p; - if (!(p = ngx_alloc(size, log))) { + p = ngx_alloc(size, log); + if (p == NULL) { return NULL; } @@ -26,7 +28,8 @@ ngx_pool_t *ngx_create_pool(size_t size, ngx_log_t *log) } -void ngx_destroy_pool(ngx_pool_t *pool) +void +ngx_destroy_pool(ngx_pool_t *pool) { ngx_pool_t *p, *n; ngx_pool_large_t *l; @@ -68,7 +71,8 @@ void ngx_destroy_pool(ngx_pool_t *pool) } -void *ngx_palloc(ngx_pool_t *pool, size_t size) +void * +ngx_palloc(ngx_pool_t *pool, size_t size) { u_char *m; ngx_pool_t *p, *n; @@ -94,7 +98,8 @@ void *ngx_palloc(ngx_pool_t *pool, size_t size) /* allocate a new pool block */ - if (!(n = ngx_create_pool((size_t) (p->end - (u_char *) p), p->log))) { + n = ngx_create_pool((size_t) (p->end - (u_char *) p), p->log); + if (n == NULL) { return NULL; } @@ -125,7 +130,8 @@ void *ngx_palloc(ngx_pool_t *pool, size_t size) } if (large == NULL) { - if (!(large = ngx_palloc(pool, sizeof(ngx_pool_large_t)))) { + large = ngx_palloc(pool, sizeof(ngx_pool_large_t)); + if (large == NULL) { return NULL; } @@ -133,11 +139,13 @@ void *ngx_palloc(ngx_pool_t *pool, size_t size) } #if 0 - if (!(p = ngx_memalign(ngx_pagesize, size, pool->log))) { + p = ngx_memalign(ngx_pagesize, size, pool->log); + if (p == NULL) { return NULL; } #else - if (!(p = ngx_alloc(size, pool->log))) { + p = ngx_alloc(size, pool->log); + if (p == NULL) { return NULL; } #endif @@ -155,7 +163,8 @@ void *ngx_palloc(ngx_pool_t *pool, size_t size) } -ngx_int_t ngx_pfree(ngx_pool_t *pool, void *p) +ngx_int_t +ngx_pfree(ngx_pool_t *pool, void *p) { ngx_pool_large_t *l; @@ -174,7 +183,8 @@ ngx_int_t ngx_pfree(ngx_pool_t *pool, void *p) } -void *ngx_pcalloc(ngx_pool_t *pool, size_t size) +void * +ngx_pcalloc(ngx_pool_t *pool, size_t size) { void *p; @@ -188,7 +198,8 @@ void *ngx_pcalloc(ngx_pool_t *pool, size_t size) #if 0 -static void *ngx_get_cached_block(size_t size) +static void * +ngx_get_cached_block(size_t size) { void *p; ngx_cached_block_slot_t *slot; |