# HG changeset patch # User Igor Sysoev # Date 1258275788 0 # Node ID 93e8daca5dbb80703659a72a86595656a26bd285 # Parent d4ad1b0b6c8d8f30f3b88cfceee9c2cacfa745c6 update allocation error messages diff --git a/src/os/unix/ngx_alloc.c b/src/os/unix/ngx_alloc.c --- a/src/os/unix/ngx_alloc.c +++ b/src/os/unix/ngx_alloc.c @@ -21,7 +21,7 @@ ngx_alloc(size_t size, ngx_log_t *log) p = malloc(size); if (p == NULL) { ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, - "malloc() %uz bytes failed", size); + "malloc(%uz) failed", size); } ngx_log_debug2(NGX_LOG_DEBUG_ALLOC, log, 0, "malloc: %p:%uz", p, size); @@ -57,8 +57,7 @@ ngx_memalign(size_t alignment, size_t si if (err) { ngx_log_error(NGX_LOG_EMERG, log, err, - "posix_memalign() %uz bytes aligned to %uz failed", - size, alignment); + "posix_memalign(%uz, %uz) failed", alignment, size); p = NULL; } @@ -78,8 +77,7 @@ ngx_memalign(size_t alignment, size_t si p = memalign(alignment, size); if (p == NULL) { ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, - "memalign() %uz bytes aligned to %uz failed", - size, alignment); + "memalign(%uz, %uz) failed", alignment, size); } ngx_log_debug2(NGX_LOG_DEBUG_ALLOC, log, 0, diff --git a/src/os/win32/ngx_alloc.c b/src/os/win32/ngx_alloc.c --- a/src/os/win32/ngx_alloc.c +++ b/src/os/win32/ngx_alloc.c @@ -20,7 +20,7 @@ void *ngx_alloc(size_t size, ngx_log_t * p = malloc(size); if (p == NULL) { ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, - "malloc() %uz bytes failed", size); + "malloc(%uz) failed", size); } ngx_log_debug2(NGX_LOG_DEBUG_ALLOC, log, 0, "malloc: %p:%uz", p, size);