Mercurial > hg > nginx
comparison src/core/ngx_conf_file.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 |
comparison
equal
deleted
inserted
replaced
2763:819bea4e964e | 2764:d4a717592877 |
---|---|
959 va_list args; | 959 va_list args; |
960 | 960 |
961 last = errstr + NGX_MAX_CONF_ERRSTR; | 961 last = errstr + NGX_MAX_CONF_ERRSTR; |
962 | 962 |
963 va_start(args, fmt); | 963 va_start(args, fmt); |
964 p = ngx_vsnprintf(errstr, last - errstr, fmt, args); | 964 p = ngx_vslprintf(errstr, last, fmt, args); |
965 va_end(args); | 965 va_end(args); |
966 | 966 |
967 if (err) { | 967 if (err) { |
968 | 968 |
969 if (p > last - 50) { | 969 if (p > last - 50) { |
975 *p++ = '.'; | 975 *p++ = '.'; |
976 *p++ = '.'; | 976 *p++ = '.'; |
977 } | 977 } |
978 | 978 |
979 #if (NGX_WIN32) | 979 #if (NGX_WIN32) |
980 p = ngx_snprintf(p, last - p, ((unsigned) err < 0x80000000) | 980 p = ngx_slprintf(p, last, ((unsigned) err < 0x80000000) |
981 ? " (%d: " : " (%Xd: ", err); | 981 ? " (%d: " : " (%Xd: ", err); |
982 #else | 982 #else |
983 p = ngx_snprintf(p, last - p, " (%d: ", err); | 983 p = ngx_slprintf(p, last, " (%d: ", err); |
984 #endif | 984 #endif |
985 | 985 |
986 p = ngx_strerror_r(err, p, last - p); | 986 p = ngx_strerror_r(err, p, last - p); |
987 | 987 |
988 *p++ = ')'; | 988 *p++ = ')'; |