Mercurial > hg > nginx
diff src/core/ngx_cycle.c @ 2049:2a92804f4109
*) back out r2040
*) refactor ngx_palloc()
*) introduce ngx_pnalloc()
*) additional pool blocks have smaller header
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Tue, 17 Jun 2008 15:00:30 +0000 |
| parents | b56d4b1ebac7 |
| children | 01b71aa095cc |
line wrap: on
line diff
--- a/src/core/ngx_cycle.c Mon Jun 16 09:11:12 2008 +0000 +++ b/src/core/ngx_cycle.c Tue Jun 17 15:00:30 2008 +0000 @@ -81,7 +81,7 @@ cycle->conf_file.len = old_cycle->conf_file.len; - cycle->conf_file.data = ngx_palloc(pool, old_cycle->conf_file.len + 1); + cycle->conf_file.data = ngx_pnalloc(pool, old_cycle->conf_file.len + 1); if (cycle->conf_file.data == NULL) { ngx_destroy_pool(pool); return NULL; @@ -182,7 +182,7 @@ hostname[NGX_MAXHOSTNAMELEN - 1] = '\0'; cycle->hostname.len = ngx_strlen(hostname); - cycle->hostname.data = ngx_palloc(pool, cycle->hostname.len); + cycle->hostname.data = ngx_pnalloc(pool, cycle->hostname.len); if (cycle->hostname.data == NULL) { ngx_destroy_pool(pool); return NULL; @@ -460,8 +460,8 @@ #else - lock_file = ngx_palloc(cycle->pool, - cycle->lock_file.len + shm_zone[i].name.len); + lock_file = ngx_pnalloc(cycle->pool, + cycle->lock_file.len + shm_zone[i].name.len); if (lock_file == NULL) { goto failed;