Mercurial > hg > nginx
changeset 4604:d3fc672fd6cc
Fix of "%f" format handling.
ngx_sprintf("%.2f", 0.999) incorrectly resulted in "0.100" instead of "1.00".
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 23 Apr 2012 11:11:32 +0000 |
parents | 3fd9155f9534 |
children | 92ca02d2eccb |
files | src/core/ngx_string.c |
diffstat | 1 files changed, 20 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_string.c Mon Apr 23 11:05:21 2012 +0000 +++ b/src/core/ngx_string.c Mon Apr 23 11:11:32 2012 +0000 @@ -146,12 +146,12 @@ { u_char *p, zero; int d; - double f, scale; + double f; size_t len, slen; int64_t i64; - uint64_t ui64; + uint64_t ui64, frac; ngx_msec_t ms; - ngx_uint_t width, sign, hex, max_width, frac_width, n; + ngx_uint_t width, sign, hex, max_width, frac_width, scale, n; ngx_str_t *v; ngx_variable_value_t *vv; @@ -365,28 +365,31 @@ } ui64 = (int64_t) f; + frac = 0; + + if (frac_width) { + + scale = 1; + for (n = frac_width; n; n--) { + scale *= 10; + } + + frac = (uint64_t) ((f - (double) ui64) * scale + 0.5); + + if (frac == scale) { + ui64++; + frac = 0; + } + } buf = ngx_sprintf_num(buf, last, ui64, zero, 0, width); if (frac_width) { - if (buf < last) { *buf++ = '.'; } - scale = 1.0; - - for (n = frac_width; n; n--) { - scale *= 10.0; - } - - /* - * (int64_t) cast is required for msvc6: - * it cannot convert uint64_t to double - */ - ui64 = (uint64_t) ((f - (int64_t) ui64) * scale + 0.5); - - buf = ngx_sprintf_num(buf, last, ui64, '0', 0, frac_width); + buf = ngx_sprintf_num(buf, last, frac, '0', 0, frac_width); } fmt++;