From efde3eb92e00cd8d181ac13b8f5a2f58ec4c0460 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Sat, 23 Apr 2011 17:25:06 +0000 Subject: [PATCH] fix building by gcc 4.6 without --with-debug --- src/core/ngx_resolver.c | 8 ++++---- src/event/modules/ngx_epoll_module.c | 13 +++---------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c index 5b7bbbcb1..ab7883011 100644 --- a/src/core/ngx_resolver.c +++ b/src/core/ngx_resolver.c @@ -1422,7 +1422,7 @@ ngx_resolver_process_ptr(ngx_resolver_t *r, u_char *buf, size_t n, in_addr_t addr; ngx_int_t digit; ngx_str_t name; - ngx_uint_t i, mask, qtype, qclass, qident; + ngx_uint_t i, mask, qident; ngx_resolver_an_t *an; ngx_resolver_ctx_t *ctx, *next; ngx_resolver_node_t *rn; @@ -1514,12 +1514,12 @@ ngx_resolver_process_ptr(ngx_resolver_t *r, u_char *buf, size_t n, an = (ngx_resolver_an_t *) &buf[i + 2]; - qtype = (an->type_hi << 8) + an->type_lo; - qclass = (an->class_hi << 8) + an->class_lo; len = (an->len_hi << 8) + an->len_lo; ngx_log_debug3(NGX_LOG_DEBUG_CORE, r->log, 0, - "resolver qt:%ui cl:%ui len:%uz", qtype, qclass, len); + "resolver qt:%ui cl:%ui len:%uz", + (an->type_hi << 8) + an->type_lo, + (an->class_hi << 8) + an->class_lo, len); i += 2 + sizeof(ngx_resolver_an_t); diff --git a/src/event/modules/ngx_epoll_module.c b/src/event/modules/ngx_epoll_module.c index 91fe1ecb7..e30501b00 100644 --- a/src/event/modules/ngx_epoll_module.c +++ b/src/event/modules/ngx_epoll_module.c @@ -518,7 +518,6 @@ ngx_epoll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_uint_t flags) ngx_int_t instance, i; ngx_uint_t level; ngx_err_t err; - ngx_log_t *log; ngx_event_t *rev, *wev, **queue; ngx_connection_t *c; @@ -565,8 +564,6 @@ ngx_epoll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_uint_t flags) ngx_mutex_lock(ngx_posted_events_mutex); - log = cycle->log; - for (i = 0; i < events; i++) { c = event_list[i].data.ptr; @@ -587,25 +584,21 @@ ngx_epoll_process_events(ngx_cycle_t *cycle, ngx_msec_t timer, ngx_uint_t flags) continue; } -#if (NGX_DEBUG0) - log = c->log ? c->log : cycle->log; -#endif - revents = event_list[i].events; - ngx_log_debug3(NGX_LOG_DEBUG_EVENT, log, 0, + ngx_log_debug3(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "epoll: fd:%d ev:%04XD d:%p", c->fd, revents, event_list[i].data.ptr); if (revents & (EPOLLERR|EPOLLHUP)) { - ngx_log_debug2(NGX_LOG_DEBUG_EVENT, log, 0, + ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0, "epoll_wait() error on fd:%d ev:%04XD", c->fd, revents); } #if 0 if (revents & ~(EPOLLIN|EPOLLOUT|EPOLLERR|EPOLLHUP)) { - ngx_log_error(NGX_LOG_ALERT, log, 0, + ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, "strange epoll_wait() events fd:%d ev:%04XD", c->fd, revents); }