From e09741ba06fd4870d90be6df7c59cd4e6da8a8b0 Mon Sep 17 00:00:00 2001 From: Sergey Kandaurov Date: Tue, 20 Aug 2013 20:47:16 +0400 Subject: [PATCH] Format specifier fixes in error logging. --- src/core/ngx_open_file_cache.c | 2 +- src/event/modules/ngx_devpoll_module.c | 4 ++-- src/http/ngx_http_special_response.c | 2 +- src/http/ngx_http_variables.c | 2 +- src/os/unix/ngx_channel.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core/ngx_open_file_cache.c b/src/core/ngx_open_file_cache.c index c44ac96b8..b72af5ea0 100644 --- a/src/core/ngx_open_file_cache.c +++ b/src/core/ngx_open_file_cache.c @@ -124,7 +124,7 @@ ngx_open_file_cache_cleanup(void *data) if (cache->current) { ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0, - "%d items still leave in open file cache", + "%ui items still leave in open file cache", cache->current); } diff --git a/src/event/modules/ngx_devpoll_module.c b/src/event/modules/ngx_devpoll_module.c index 6fdd00233..0506103e6 100644 --- a/src/event/modules/ngx_devpoll_module.c +++ b/src/event/modules/ngx_devpoll_module.c @@ -425,7 +425,7 @@ ngx_devpoll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, case -1: ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, - "ioctl(DP_ISPOLLED) failed for socket %d, event", + "ioctl(DP_ISPOLLED) failed for socket %d, event %04Xd", fd, revents); break; @@ -449,7 +449,7 @@ ngx_devpoll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, != (ssize_t) sizeof(struct pollfd)) { ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, - "write(/dev/poll) for %d failed, fd"); + "write(/dev/poll) for %d failed", fd); } if (close(fd) == -1) { diff --git a/src/http/ngx_http_special_response.c b/src/http/ngx_http_special_response.c index 875c24d9c..546400539 100644 --- a/src/http/ngx_http_special_response.c +++ b/src/http/ngx_http_special_response.c @@ -370,7 +370,7 @@ ngx_http_special_response_handler(ngx_http_request_t *r, ngx_int_t error) ngx_http_core_loc_conf_t *clcf; ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, - "http special response: %d, \"%V?%V\"", + "http special response: %i, \"%V?%V\"", error, &r->uri, &r->args); r->err_status = error; diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c index b4f8eeba0..4138bda42 100644 --- a/src/http/ngx_http_variables.c +++ b/src/http/ngx_http_variables.c @@ -487,7 +487,7 @@ ngx_http_get_indexed_variable(ngx_http_request_t *r, ngx_uint_t index) if (cmcf->variables.nelts <= index) { ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0, - "unknown variable index: %d", index); + "unknown variable index: %ui", index); return NULL; } diff --git a/src/os/unix/ngx_channel.c b/src/os/unix/ngx_channel.c index 536a9ed4b..8e9069660 100644 --- a/src/os/unix/ngx_channel.c +++ b/src/os/unix/ngx_channel.c @@ -144,7 +144,7 @@ ngx_read_channel(ngx_socket_t s, ngx_channel_t *ch, size_t size, ngx_log_t *log) if ((size_t) n < sizeof(ngx_channel_t)) { ngx_log_error(NGX_LOG_ALERT, log, 0, - "recvmsg() returned not enough data: %uz", n); + "recvmsg() returned not enough data: %z", n); return NGX_ERROR; }