IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

use ngx_vslprintf(), ngx_slprintf()

Browse Source
This commit is contained in:
Igor Sysoev 2009-04-27 13:06:20 +00:00
parent 4e1fe03e03
commit e1c9746e37
4 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/ngx_conf_file.c
View File

@ -961,7 +961,7 @@ ngx_conf_log_error(ngx_uint_t level, ngx_conf_t *cf, ngx_err_t err,
last = errstr + NGX_MAX_CONF_ERRSTR; last = errstr + NGX_MAX_CONF_ERRSTR;
va_start(args, fmt); va_start(args, fmt);
p = ngx_vsnprintf(errstr, last - errstr, fmt, args); p = ngx_vslprintf(errstr, last, fmt, args);
va_end(args); va_end(args);
if (err) { if (err) {
@ -977,10 +977,10 @@ ngx_conf_log_error(ngx_uint_t level, ngx_conf_t *cf, ngx_err_t err,
} }
#if (NGX_WIN32) #if (NGX_WIN32)
p = ngx_snprintf(p, last - p, ((unsigned) err < 0x80000000) p = ngx_slprintf(p, last, ((unsigned) err < 0x80000000)
? " (%d: " : " (%Xd: ", err); ? " (%d: " : " (%Xd: ", err);
#else #else
p = ngx_snprintf(p, last - p, " (%d: ", err); p = ngx_slprintf(p, last, " (%d: ", err);
#endif #endif
p = ngx_strerror_r(err, p, last - p); p = ngx_strerror_r(err, p, last - p);

28
src/core/ngx_log.c
View File

@ -101,14 +101,14 @@ ngx_log_error_core(ngx_uint_t level, ngx_log_t *log, ngx_err_t err,
p = errstr + ngx_cached_err_log_time.len; 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 */ /* 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); ngx_log_pid, ngx_log_tid);
if (log->connection) { if (log->connection) {
p = ngx_snprintf(p, last - p, "*%uA ", log->connection); p = ngx_slprintf(p, last, "*%uA ", log->connection);
} }
msg = p; msg = p;
@ -116,12 +116,12 @@ ngx_log_error_core(ngx_uint_t level, ngx_log_t *log, ngx_err_t err,
#if (NGX_HAVE_VARIADIC_MACROS) #if (NGX_HAVE_VARIADIC_MACROS)
va_start(args, fmt); va_start(args, fmt);
p = ngx_vsnprintf(p, last - p, fmt, args); p = ngx_vslprintf(p, last, fmt, args);
va_end(args); va_end(args);
#else #else
p = ngx_vsnprintf(p, last - p, fmt, args); p = ngx_vslprintf(p, last, fmt, args);
#endif #endif
@ -138,10 +138,10 @@ ngx_log_error_core(ngx_uint_t level, ngx_log_t *log, ngx_err_t err,
} }
#if (NGX_WIN32) #if (NGX_WIN32)
p = ngx_snprintf(p, last - p, ((unsigned) err < 0x80000000) p = ngx_slprintf(p, last, ((unsigned) err < 0x80000000)
? " (%d: " : " (%Xd: ", err); ? " (%d: " : " (%Xd: ", err);
#else #else
p = ngx_snprintf(p, last - p, " (%d: ", err); p = ngx_slprintf(p, last, " (%d: ", err);
#endif #endif
p = ngx_strerror_r(err, p, last - p); p = ngx_strerror_r(err, p, last - p);
@ -230,8 +230,10 @@ ngx_log_stderr(ngx_err_t err, const char *fmt, ...)
va_list args; va_list args;
u_char errstr[NGX_MAX_ERROR_STR]; u_char errstr[NGX_MAX_ERROR_STR];
last = errstr + NGX_MAX_ERROR_STR;
va_start(args, fmt); va_start(args, fmt);
p = ngx_vsnprintf(errstr, NGX_MAX_ERROR_STR, fmt, args); p = ngx_vslprintf(errstr, last, fmt, args);
va_end(args); va_end(args);
if (p > errstr + NGX_MAX_ERROR_STR - NGX_LINEFEED_SIZE) { if (p > errstr + NGX_MAX_ERROR_STR - NGX_LINEFEED_SIZE) {
@ -240,8 +242,6 @@ ngx_log_stderr(ngx_err_t err, const char *fmt, ...)
if (err) { if (err) {
last = errstr + NGX_MAX_ERROR_STR;
if (p > last - 50) { if (p > last - 50) {
/* leave a space for an error code */ /* leave a space for an error code */
@ -253,10 +253,10 @@ ngx_log_stderr(ngx_err_t err, const char *fmt, ...)
} }
#if (NGX_WIN32) #if (NGX_WIN32)
p = ngx_snprintf(p, last - p, ((unsigned) err < 0x80000000) p = ngx_slprintf(p, last, ((unsigned) err < 0x80000000)
? " (%d: " : " (%Xd: ", err); ? " (%d: " : " (%Xd: ", err);
#else #else
p = ngx_snprintf(p, last - p, " (%d: ", err); p = ngx_slprintf(p, last, " (%d: ", err);
#endif #endif
p = ngx_strerror_r(err, p, last - p); p = ngx_strerror_r(err, p, last - p);

2
src/event/ngx_event_openssl.c
View File

@ -1306,7 +1306,7 @@ ngx_ssl_error(ngx_uint_t level, ngx_log_t *log, ngx_err_t err, char *fmt, ...)
last = errstr + NGX_MAX_CONF_ERRSTR; last = errstr + NGX_MAX_CONF_ERRSTR;
va_start(args, fmt); va_start(args, fmt);
p = ngx_vsnprintf(errstr, sizeof(errstr) - 1, fmt, args); p = ngx_vslprintf(errstr, last - 1, fmt, args);
va_end(args); va_end(args);
p = ngx_cpystrn(p, (u_char *) " (SSL:", last - p); p = ngx_cpystrn(p, (u_char *) " (SSL:", last - p);

9
src/os/win32/ngx_event_log.c
View File

@ -22,17 +22,16 @@ ngx_event_log(ngx_err_t err, const char *fmt, ...)
const char *msgarg[9]; const char *msgarg[9];
static u_char netmsg[] = "%SystemRoot%\\System32\\netmsg.dll"; 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 = text + GetModuleFileName(NULL, (char *) text, NGX_MAX_ERROR_STR - 50);
*p++ = ':'; *p++ = ':';
ngx_linefeed(p); ngx_linefeed(p);
va_start(args, fmt); va_start(args, fmt);
p = ngx_vsnprintf(p, NGX_MAX_ERROR_STR, fmt, args); p = ngx_vslprintf(p, last, fmt, args);
va_end(args); va_end(args);
last = text + NGX_MAX_ERROR_STR;
if (err) { if (err) {
if (p > last - 50) { if (p > last - 50) {
@ -45,8 +44,8 @@ ngx_event_log(ngx_err_t err, const char *fmt, ...)
*p++ = '.'; *p++ = '.';
} }
p = ngx_snprintf(p, last - p, ((unsigned) err < 0x80000000) p = ngx_slprintf(p, last, ((unsigned) err < 0x80000000)
? " (%d: " : " (%Xd: ", err); ? " (%d: " : " (%Xd: ", err);
p = ngx_strerror_r(err, p, last - p); p = ngx_strerror_r(err, p, last - p);
if (p < last) { if (p < last) {