From b13029c57c3011c6df10566278eb4d5255e592d2 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Sun, 15 Nov 2009 09:03:08 +0000 Subject: [PATCH] update allocation error messages --- src/os/unix/ngx_alloc.c | 8 +++----- src/os/win32/ngx_alloc.c | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/os/unix/ngx_alloc.c b/src/os/unix/ngx_alloc.c index 253117434..b215f7bae 100644 --- 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 size, ngx_log_t *log) 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 size, ngx_log_t *log) 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 index d04c3f37c..e09b3a301 100644 --- 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 *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);