Mercurial > hg > nginx
changeset 8570:6dac06dfe779 quic
QUIC: inline function instead of macro for hexdump.
This prevents name clashes with local variables.
| author | Vladimir Homutov <vl@nginx.com> |
|---|---|
| date | Mon, 05 Oct 2020 10:03:01 +0300 |
| parents | a6784cf32c13 |
| children | a0631204d88a |
| files | src/event/ngx_event_quic.h |
| diffstat | 1 files changed, 14 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/event/ngx_event_quic.h +++ b/src/event/ngx_event_quic.h @@ -130,18 +130,20 @@ void ngx_quic_finalize_connection(ngx_co #if (NGX_DEBUG) -#define ngx_quic_hexdump(log, label, data, len) \ -do { \ - ngx_int_t m; \ - u_char buf[2048]; \ - \ - if (log->log_level & NGX_LOG_DEBUG_EVENT) { \ - m = ngx_hex_dump(buf, (u_char *) data, ngx_min(len, 1024)) - buf; \ - ngx_log_debug4(NGX_LOG_DEBUG_EVENT, log, 0, \ - label " len:%uz data:%*s%s", \ - len, m, buf, len < 2048 ? "" : "..."); \ - } \ -} while (0) +static ngx_inline +void ngx_quic_hexdump(ngx_log_t *log, const char *label, u_char *data, + size_t len) +{ + ngx_int_t m; + u_char buf[2048]; + + if (log->log_level & NGX_LOG_DEBUG_EVENT) { + m = ngx_hex_dump(buf, data, (len > 1024) ? 1024 : len) - buf; + ngx_log_debug5(NGX_LOG_DEBUG_EVENT, log, 0, + "%s len:%uz data:%*s%s", + label, len, m, buf, len < 2048 ? "" : "..."); + } +} #else