aboutsummaryrefslogtreecommitdiff
path: root/src/core/ngx_alloc.c
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2004-02-24 17:31:46 +0000
committerIgor Sysoev <igor@sysoev.ru>2004-02-24 17:31:46 +0000
commit48fef6654cc90e05004648423cb5dd7c6f7770f0 (patch)
treec61d52b4dddfb64e28de98bf402b96706f0be418 /src/core/ngx_alloc.c
parentb54698b5798b7f1a54226274347ce1faee5a92a4 (diff)
downloadnginx-48fef6654cc90e05004648423cb5dd7c6f7770f0.tar.gz
nginx-48fef6654cc90e05004648423cb5dd7c6f7770f0.zip
nginx-0.0.2-2004-02-24-20:31:46 import
Diffstat (limited to 'src/core/ngx_alloc.c')
-rw-r--r--src/core/ngx_alloc.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/core/ngx_alloc.c b/src/core/ngx_alloc.c
index ae96564fc..1cbd4c8c8 100644
--- a/src/core/ngx_alloc.c
+++ b/src/core/ngx_alloc.c
@@ -9,10 +9,11 @@ void *ngx_alloc(size_t size, ngx_log_t *log)
if (!(p = malloc(size))) {
ngx_log_error(NGX_LOG_EMERG, log, ngx_errno,
- "malloc() %d bytes failed", size);
+ "malloc() " SIZE_T_FMT " bytes failed", size);
}
- ngx_log_debug2(NGX_LOG_DEBUG_ALLOC, log, 0, "malloc: %08x:%d", p, size);
+ ngx_log_debug2(NGX_LOG_DEBUG_ALLOC, log, 0,
+ "malloc: " PTR_FMT ":" SIZE_T_FMT, p, size);
return p;
}
@@ -57,7 +58,7 @@ void ngx_destroy_pool(ngx_pool_t *pool)
for (l = pool->large; l; l = l->next) {
ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0,
- "free: %08x", l->alloc);
+ "free: " PTR_FMT, l->alloc);
if (l->alloc) {
free(l->alloc);
@@ -72,7 +73,8 @@ void ngx_destroy_pool(ngx_pool_t *pool)
*/
for (p = pool, n = pool->next; /* void */; p = n, n = n->next) {
- ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0, "free: %08x", p);
+ ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0,
+ "free: " PTR_FMT, p);
if (n == NULL) {
break;
@@ -179,7 +181,7 @@ void ngx_pfree(ngx_pool_t *pool, void *p)
for (l = pool->large; l; l = l->next) {
if (p == l->alloc) {
ngx_log_debug1(NGX_LOG_DEBUG_ALLOC, pool->log, 0,
- "free: %08x", l->alloc);
+ "free: " PTR_FMT, l->alloc);
free(l->alloc);
l->alloc = NULL;
}