mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-12 13:42:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix of "%f" format handling.

Browse Source 
ngx_sprintf("%.2f", 0.999) incorrectly resulted in "0.100" instead of "1.00".
This commit is contained in:
Igor Sysoev 2012-04-23 11:11:32 +00:00
parent 430fbedfa7
commit c7bb66a9a3
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/core/ngx_string.c
View File

@ -146,12 +146,12 @@ ngx_vslprintf(u_char *buf, u_char *last, const char *fmt, va_list args)
{ {
u_char *p, zero; u_char *p, zero;
int d; int d;
double f, scale; double f;
size_t len, slen; size_t len, slen;
int64_t i64; int64_t i64;
uint64_t ui64; uint64_t ui64, frac;
ngx_msec_t ms; 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_str_t *v;
ngx_variable_value_t *vv; ngx_variable_value_t *vv;
@ -365,28 +365,31 @@ ngx_vslprintf(u_char *buf, u_char *last, const char *fmt, va_list args)
} }
ui64 = (int64_t) f; 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); buf = ngx_sprintf_num(buf, last, ui64, zero, 0, width);
if (frac_width) { if (frac_width) {
if (buf < last) { if (buf < last) {
*buf++ = '.'; *buf++ = '.';
} }
scale = 1.0; buf = ngx_sprintf_num(buf, last, frac, '0', 0, frac_width);
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);
} }
fmt++; fmt++;