Mercurial > hg > nginx
changeset 2764:d4a717592877
use ngx_vslprintf(), ngx_slprintf()
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 27 Apr 2009 13:06:20 +0000 |
parents | 819bea4e964e |
children | 6d358aeaa989 |
files | src/core/ngx_conf_file.c src/core/ngx_log.c src/event/ngx_event_openssl.c src/os/win32/ngx_event_log.c |
diffstat | 4 files changed, 23 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_conf_file.c +++ b/src/core/ngx_conf_file.c @@ -961,7 +961,7 @@ ngx_conf_log_error(ngx_uint_t level, ngx last = errstr + NGX_MAX_CONF_ERRSTR; va_start(args, fmt); - p = ngx_vsnprintf(errstr, last - errstr, fmt, args); + p = ngx_vslprintf(errstr, last, fmt, args); va_end(args); if (err) { @@ -977,10 +977,10 @@ ngx_conf_log_error(ngx_uint_t level, ngx } #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);
--- a/src/core/ngx_log.c +++ b/src/core/ngx_log.c @@ -101,14 +101,14 @@ ngx_log_error_core(ngx_uint_t level, ngx 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 @@ ngx_log_error_core(ngx_uint_t level, ngx #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 @@ ngx_log_error_core(ngx_uint_t level, ngx } #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 @@ ngx_log_stderr(ngx_err_t err, const char 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 @@ ngx_log_stderr(ngx_err_t err, const char if (err) { - last = errstr + NGX_MAX_ERROR_STR; - if (p > last - 50) { /* leave a space for an error code */ @@ -253,10 +253,10 @@ ngx_log_stderr(ngx_err_t err, const char } #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);
--- a/src/event/ngx_event_openssl.c +++ b/src/event/ngx_event_openssl.c @@ -1306,7 +1306,7 @@ ngx_ssl_error(ngx_uint_t level, ngx_log_ last = errstr + NGX_MAX_CONF_ERRSTR; va_start(args, fmt); - p = ngx_vsnprintf(errstr, sizeof(errstr) - 1, fmt, args); + p = ngx_vslprintf(errstr, last - 1, fmt, args); va_end(args); p = ngx_cpystrn(p, (u_char *) " (SSL:", last - p);
--- a/src/os/win32/ngx_event_log.c +++ b/src/os/win32/ngx_event_log.c @@ -22,17 +22,16 @@ ngx_event_log(ngx_err_t err, const char const char *msgarg[9]; static u_char netmsg[] = "%SystemRoot%\\System32\\netmsg.dll"; + last = text + NGX_MAX_ERROR_STR; p = text + GetModuleFileName(NULL, (char *) text, NGX_MAX_ERROR_STR - 50); *p++ = ':'; ngx_linefeed(p); va_start(args, fmt); - p = ngx_vsnprintf(p, NGX_MAX_ERROR_STR, fmt, args); + p = ngx_vslprintf(p, last, fmt, args); va_end(args); - last = text + NGX_MAX_ERROR_STR; - if (err) { if (p > last - 50) { @@ -45,8 +44,8 @@ ngx_event_log(ngx_err_t err, const char *p++ = '.'; } - p = ngx_snprintf(p, last - p, ((unsigned) err < 0x80000000) - ? " (%d: " : " (%Xd: ", err); + p = ngx_slprintf(p, last, ((unsigned) err < 0x80000000) + ? " (%d: " : " (%Xd: ", err); p = ngx_strerror_r(err, p, last - p); if (p < last) {