Mercurial > hg > nginx

changeset 6509:7640d6c213e1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed redundant "u" format specifier. It is implied for "x" and "X".
author Ruslan Ermilov <ru@nginx.com>
date Fri, 08 Apr 2016 15:03:38 +0300
parents 151fd02a4317
children a3be359e6c7d
files src/core/ngx_inet.c src/core/ngx_resolver.c src/event/modules/ngx_epoll_module.c src/os/win32/ngx_process.c src/os/win32/ngx_process_cycle.c
diffstat 5 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/core/ngx_inet.c
+++ b/src/core/ngx_inet.c
@@ -348,7 +348,7 @@ ngx_inet6_ntop(u_char *p, u_char *text, 
             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) {
             *dst++ = ':';
--- a/src/core/ngx_resolver.c
+++ b/src/core/ngx_resolver.c
@@ -1733,7 +1733,7 @@ ngx_resolver_process_response(ngx_resolv
     trunc = flags & 0x0200;
 
     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,
                    (response->nns_hi << 8) + response->nns_lo,
                    (response->nar_hi << 8) + response->nar_lo);
@@ -1741,7 +1741,7 @@ ngx_resolver_process_response(ngx_resolv
     /* response to a standard query */
     if ((flags & 0xf870) != 0x8000 || (trunc && tcp)) {
         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);
         return;
     }
--- a/src/event/modules/ngx_epoll_module.c
+++ b/src/event/modules/ngx_epoll_module.c
@@ -910,7 +910,7 @@ ngx_epoll_eventfd_handler(ngx_event_t *e
             for (i = 0; i < events; i++) {
 
                 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].res, event[i].res2);
 
--- a/src/os/win32/ngx_process.c
+++ b/src/os/win32/ngx_process.c
@@ -138,7 +138,7 @@ ngx_spawn_process(ngx_cycle_t *cycle, ch
         }
 
         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);
 
         goto failed;
--- a/src/os/win32/ngx_process_cycle.c
+++ b/src/os/win32/ngx_process_cycle.c
@@ -484,7 +484,7 @@ ngx_reap_worker(ngx_cycle_t *cycle, HAND
         }
 
         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_close_handle(ngx_processes[n].reopen);