diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2008-06-17 15:00:30 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2008-06-17 15:00:30 +0000 |
| commit | 7f6b2ffc60135a8340213fe8d5d0b70e479e3ac1 (patch) | |
| tree | 90325238fc9a9d9a7e8818e76b60cc9e011242aa /src/os/unix | |
| parent | c2eb2cf4cba5f47fbc33eebe279f0d3855401421 (diff) | |
| download | nginx-7f6b2ffc60135a8340213fe8d5d0b70e479e3ac1.tar.gz nginx-7f6b2ffc60135a8340213fe8d5d0b70e479e3ac1.zip | |
*) back out r2040
*) refactor ngx_palloc()
*) introduce ngx_pnalloc()
*) additional pool blocks have smaller header
Diffstat (limited to 'src/os/unix')
| -rw-r--r-- | src/os/unix/ngx_process_cycle.c | 2 | ||||
| -rw-r--r-- | src/os/unix/ngx_user.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c index bacba5945..54ca4ffa3 100644 --- a/src/os/unix/ngx_process_cycle.c +++ b/src/os/unix/ngx_process_cycle.c @@ -108,7 +108,7 @@ ngx_master_process_cycle(ngx_cycle_t *cycle) size += ngx_strlen(ngx_argv[i]) + 1; } - title = ngx_palloc(cycle->pool, size); + title = ngx_pnalloc(cycle->pool, size); p = ngx_cpymem(title, master_process, sizeof(master_process) - 1); for (i = 0; i < ngx_argc; i++) { diff --git a/src/os/unix/ngx_user.c b/src/os/unix/ngx_user.c index b40a2b721..4bad1c307 100644 --- a/src/os/unix/ngx_user.c +++ b/src/os/unix/ngx_user.c @@ -43,7 +43,7 @@ ngx_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted) if (err == 0) { len = ngx_strlen(value); - *encrypted = ngx_palloc(pool, len); + *encrypted = ngx_pnalloc(pool, len); if (*encrypted) { ngx_memcpy(*encrypted, value, len + 1); return NGX_OK; @@ -81,7 +81,7 @@ ngx_crypt(ngx_pool_t *pool, u_char *key, u_char *salt, u_char **encrypted) if (value) { len = ngx_strlen(value); - *encrypted = ngx_palloc(pool, len); + *encrypted = ngx_pnalloc(pool, len); if (*encrypted) { ngx_memcpy(*encrypted, value, len + 1); } |