diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-06-08 16:26:37 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-06-08 16:26:37 +0000 |
| commit | 3eb1995529f847b64523852e7dfb120071071c24 (patch) | |
| tree | c0b04cdc9e1185f27bea8076bea293a44275e85c /src | |
| parent | 0ab91b901299ac41e3867ebec7e04e5082a4c8b4 (diff) | |
| download | nginx-3eb1995529f847b64523852e7dfb120071071c24.tar.gz nginx-3eb1995529f847b64523852e7dfb120071071c24.tar.bz2 | |
nginx-0.0.3-2004-06-08-20:26:37 import
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ngx_palloc.c | 6 | ||||
| -rw-r--r-- | src/os/unix/ngx_alloc.c | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/core/ngx_palloc.c b/src/core/ngx_palloc.c index 65e2eed66..77c113267 100644 --- a/src/core/ngx_palloc.c +++ b/src/core/ngx_palloc.c @@ -126,9 +126,15 @@ void *ngx_palloc(ngx_pool_t *pool, size_t size) large->next = NULL; } +#if 0 if (!(p = ngx_memalign(ngx_pagesize, size, pool->log))) { return NULL; } +#else + if (!(p = ngx_alloc(size, pool->log))) { + return NULL; + } +#endif if (pool->large == NULL) { pool->large = large; diff --git a/src/os/unix/ngx_alloc.c b/src/os/unix/ngx_alloc.c index 69925d1be..bb3a299e1 100644 --- a/src/os/unix/ngx_alloc.c +++ b/src/os/unix/ngx_alloc.c @@ -38,11 +38,11 @@ void *ngx_calloc(size_t size, ngx_log_t *log) #if (HAVE_POSIX_MEMALIGN) -void *ngx_memalign(size_t aligment, size_t size, ngx_log_t *log) +void *ngx_memalign(size_t alignment, size_t size, ngx_log_t *log) { void *p; - if (posix_memalign(&p, aligment, size) == -1) { + if (posix_memalign(&p, alignment, size) == -1) { ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "posix_memalign() " SIZE_T_FMT " bytes aligned to " SIZE_T_FMT " failed", size, alignment); @@ -54,13 +54,13 @@ void *ngx_memalign(size_t aligment, size_t size, ngx_log_t *log) return p; } -#esif (HAVE_MEMALIGN) +#elif (HAVE_MEMALIGN) -void *ngx_memalign(size_t aligment, size_t size, ngx_log_t *log) +void *ngx_memalign(size_t alignment, size_t size, ngx_log_t *log) { void *p; - if (!(p = memalign(aligment, size))) { + if (!(p = memalign(alignment, size))) { ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "memalign() " SIZE_T_FMT " bytes aligned to " SIZE_T_FMT " failed", size, alignment); |