From bd3516e8d98815a540ff65451889f6a2a0991c71 Mon Sep 17 00:00:00 2001 From: Sergey Kandaurov Date: Thu, 6 Mar 2014 18:25:59 +0400 Subject: [PATCH] Fixed format specifier in logging of "c->number". --- src/core/ngx_resolver.c | 2 +- src/event/ngx_event_accept.c | 2 +- src/event/ngx_event_connect.c | 2 +- src/mail/ngx_mail_handler.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c index 7fab50abc..645738ce5 100644 --- a/src/core/ngx_resolver.c +++ b/src/core/ngx_resolver.c @@ -3062,7 +3062,7 @@ ngx_udp_connect(ngx_udp_connection_t *uc) #endif ngx_log_debug3(NGX_LOG_DEBUG_EVENT, &uc->log, 0, - "connect to %V, fd:%d #%d", &uc->server, s, c->number); + "connect to %V, fd:%d #%uA", &uc->server, s, c->number); rc = connect(s, uc->sockaddr, uc->socklen); diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c index e33dce81e..bf67ecee0 100644 --- a/src/event/ngx_event_accept.c +++ b/src/event/ngx_event_accept.c @@ -344,7 +344,7 @@ ngx_event_accept(ngx_event_t *ev) #endif ngx_log_debug3(NGX_LOG_DEBUG_EVENT, log, 0, - "*%d accept: %V fd:%d", c->number, &c->addr_text, s); + "*%uA accept: %V fd:%d", c->number, &c->addr_text, s); if (ngx_add_conn && (ngx_event_flags & NGX_USE_EPOLL_EVENT) == 0) { if (ngx_add_conn(c) == NGX_ERROR) { diff --git a/src/event/ngx_event_connect.c b/src/event/ngx_event_connect.c index fddad0a92..5fcabcfd1 100644 --- a/src/event/ngx_event_connect.c +++ b/src/event/ngx_event_connect.c @@ -122,7 +122,7 @@ ngx_event_connect_peer(ngx_peer_connection_t *pc) } ngx_log_debug3(NGX_LOG_DEBUG_EVENT, pc->log, 0, - "connect to %V, fd:%d #%d", pc->name, s, c->number); + "connect to %V, fd:%d #%uA", pc->name, s, c->number); rc = connect(s, pc->sockaddr, pc->socklen); diff --git a/src/mail/ngx_mail_handler.c b/src/mail/ngx_mail_handler.c index 7cfff1a07..9212a121c 100644 --- a/src/mail/ngx_mail_handler.c +++ b/src/mail/ngx_mail_handler.c @@ -127,7 +127,7 @@ ngx_mail_init_connection(ngx_connection_t *c) c->data = s; s->connection = c; - ngx_log_error(NGX_LOG_INFO, c->log, 0, "*%ui client %V connected to %V", + ngx_log_error(NGX_LOG_INFO, c->log, 0, "*%uA client %V connected to %V", c->number, &c->addr_text, s->addr_text); ctx = ngx_palloc(c->pool, sizeof(ngx_mail_log_ctx_t));