mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 09:42:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed redundant "u" format specifier.

Browse Source 
It is implied for "x" and "X".
This commit is contained in:
Ruslan Ermilov 2016-04-08 15:03:38 +03:00
parent 4d1f67fd91
commit 37a3a2b2e8
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/ngx_inet.c
View File

@ -348,7 +348,7 @@ ngx_inet6_ntop(u_char *p, u_char *text, size_t len)
continue; continue;
} }
dst = ngx_sprintf(dst, "%uxd", p[i] * 256 + p[i + 1]); dst = ngx_sprintf(dst, "%xd", p[i] * 256 + p[i + 1]);
if (i < 14) { if (i < 14) {
*dst++ = ':'; *dst++ = ':';

4
src/core/ngx_resolver.c
View File

@ -1733,7 +1733,7 @@ ngx_resolver_process_response(ngx_resolver_t *r, u_char *buf, size_t n,
trunc = flags & 0x0200; trunc = flags & 0x0200;
ngx_log_debug6(NGX_LOG_DEBUG_CORE, r->log, 0, ngx_log_debug6(NGX_LOG_DEBUG_CORE, r->log, 0,
"resolver DNS response %ui fl:%04Xui %ui/%ui/%ud/%ud", "resolver DNS response %ui fl:%04Xi %ui/%ui/%ud/%ud",
ident, flags, nqs, nan, ident, flags, nqs, nan,
(response->nns_hi << 8) + response->nns_lo, (response->nns_hi << 8) + response->nns_lo,
(response->nar_hi << 8) + response->nar_lo); (response->nar_hi << 8) + response->nar_lo);
@ -1741,7 +1741,7 @@ ngx_resolver_process_response(ngx_resolver_t *r, u_char *buf, size_t n,
/* response to a standard query */ /* response to a standard query */
if ((flags & 0xf870) != 0x8000 || (trunc && tcp)) { if ((flags & 0xf870) != 0x8000 || (trunc && tcp)) {
ngx_log_error(r->log_level, r->log, 0, ngx_log_error(r->log_level, r->log, 0,
"invalid %s DNS response %ui fl:%04Xui", "invalid %s DNS response %ui fl:%04Xi",
tcp ? "TCP" : "UDP", ident, flags); tcp ? "TCP" : "UDP", ident, flags);
return; return;
} }

2
src/event/modules/ngx_epoll_module.c
View File

@ -910,7 +910,7 @@ ngx_epoll_eventfd_handler(ngx_event_t *ev)
for (i = 0; i < events; i++) { for (i = 0; i < events; i++) {
ngx_log_debug4(NGX_LOG_DEBUG_EVENT, ev->log, 0, ngx_log_debug4(NGX_LOG_DEBUG_EVENT, ev->log, 0,
"io_event: %uXL %uXL %L %L", "io_event: %XL %XL %L %L",
event[i].data, event[i].obj, event[i].data, event[i].obj,
event[i].res, event[i].res2); event[i].res, event[i].res2);

2
src/os/win32/ngx_process.c
View File

@ -138,7 +138,7 @@ ngx_spawn_process(ngx_cycle_t *cycle, char *name, ngx_int_t respawn)
} }
ngx_log_error(NGX_LOG_ALERT, cycle->log, 0, ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
"%s process %P exited with code %Xul", "%s process %P exited with code %Xl",
name, pid, code); name, pid, code);
goto failed; goto failed;

2
src/os/win32/ngx_process_cycle.c
View File

@ -484,7 +484,7 @@ ngx_reap_worker(ngx_cycle_t *cycle, HANDLE h)
} }
ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0,
"%s process %P exited with code %Xul", "%s process %P exited with code %Xl",
ngx_processes[n].name, ngx_processes[n].pid, code); ngx_processes[n].name, ngx_processes[n].pid, code);
ngx_close_handle(ngx_processes[n].reopen); ngx_close_handle(ngx_processes[n].reopen);