Mercurial > hg > nginx
diff src/core/ngx_log.c @ 2764:d4a717592877
use ngx_vslprintf(), ngx_slprintf()
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Mon, 27 Apr 2009 13:06:20 +0000 |
| parents | 77264e0157ad |
| children | 6d358aeaa989 |
line wrap: on
line diff
--- a/src/core/ngx_log.c Mon Apr 27 12:51:33 2009 +0000 +++ b/src/core/ngx_log.c Mon Apr 27 13:06:20 2009 +0000 @@ -101,14 +101,14 @@ p = errstr + ngx_cached_err_log_time.len; - p = ngx_snprintf(p, last - p, " [%V] ", &err_levels[level]); + p = ngx_slprintf(p, last, " [%V] ", &err_levels[level]); /* pid#tid */ - p = ngx_snprintf(p, last - p, "%P#" NGX_TID_T_FMT ": ", + p = ngx_slprintf(p, last, "%P#" NGX_TID_T_FMT ": ", ngx_log_pid, ngx_log_tid); if (log->connection) { - p = ngx_snprintf(p, last - p, "*%uA ", log->connection); + p = ngx_slprintf(p, last, "*%uA ", log->connection); } msg = p; @@ -116,12 +116,12 @@ #if (NGX_HAVE_VARIADIC_MACROS) va_start(args, fmt); - p = ngx_vsnprintf(p, last - p, fmt, args); + p = ngx_vslprintf(p, last, fmt, args); va_end(args); #else - p = ngx_vsnprintf(p, last - p, fmt, args); + p = ngx_vslprintf(p, last, fmt, args); #endif @@ -138,10 +138,10 @@ } #if (NGX_WIN32) - p = ngx_snprintf(p, last - p, ((unsigned) err < 0x80000000) - ? " (%d: " : " (%Xd: ", err); + p = ngx_slprintf(p, last, ((unsigned) err < 0x80000000) + ? " (%d: " : " (%Xd: ", err); #else - p = ngx_snprintf(p, last - p, " (%d: ", err); + p = ngx_slprintf(p, last, " (%d: ", err); #endif p = ngx_strerror_r(err, p, last - p); @@ -230,8 +230,10 @@ va_list args; u_char errstr[NGX_MAX_ERROR_STR]; + last = errstr + NGX_MAX_ERROR_STR; + va_start(args, fmt); - p = ngx_vsnprintf(errstr, NGX_MAX_ERROR_STR, fmt, args); + p = ngx_vslprintf(errstr, last, fmt, args); va_end(args); if (p > errstr + NGX_MAX_ERROR_STR - NGX_LINEFEED_SIZE) { @@ -240,8 +242,6 @@ if (err) { - last = errstr + NGX_MAX_ERROR_STR; - if (p > last - 50) { /* leave a space for an error code */ @@ -253,10 +253,10 @@ } #if (NGX_WIN32) - p = ngx_snprintf(p, last - p, ((unsigned) err < 0x80000000) - ? " (%d: " : " (%Xd: ", err); + p = ngx_slprintf(p, last, ((unsigned) err < 0x80000000) + ? " (%d: " : " (%Xd: ", err); #else - p = ngx_snprintf(p, last - p, " (%d: ", err); + p = ngx_slprintf(p, last, " (%d: ", err); #endif p = ngx_strerror_r(err, p, last - p);