moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

[svn] More correct handling of significant digit count with %g -- 0.002 has

Browse Source 
one significant digit, not three.
This commit is contained in:
hniksic 2005-04-16 16:02:39 -07:00
parent 9756b0adf5
commit dccc4a2d49
2 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2005-04-17 Hrvoje Niksic <hniksic@xemacs.org>
* snprintf.c (fmtfp): More correct handling of significant digit
count with %g -- 0.002 has one significant digit, not three.
2005-04-16 Hrvoje Niksic <hniksic@xemacs.org> 2005-04-16 Hrvoje Niksic <hniksic@xemacs.org>
* retr.c (fd_read_body): Respect read timeout with non-interactive * retr.c (fd_read_body): Respect read timeout with non-interactive

44
src/snprintf.c
View File

@ -727,11 +727,24 @@ fmtfp (char *buffer, size_t *currlen, size_t maxlen,
includes the digits in intpart. */ includes the digits in intpart. */
if (flags & DP_F_FP_G) if (flags & DP_F_FP_G)
{ {
LLONG temp = intpart; if (intpart != 0)
for (temp = intpart; temp != 0; temp /= 10) {
--max; /* For each digit of INTPART, print one less fractional digit. */
if (max < 0) LLONG temp = intpart;
max = 0; for (temp = intpart; temp != 0; temp /= 10)
--max;
if (max < 0)
max = 0;
}
else
{
/* For each leading 0 in fractional part, print one more
fractional digit. */
LDOUBLE temp;
if (ufvalue != 0)
for (temp = ufvalue; temp < 0.1; temp *= 10)
++max;
}
} }
/* C99: trailing zeros are removed from the fractional portion of the /* C99: trailing zeros are removed from the fractional portion of the
@ -916,6 +929,8 @@ main (void)
char buf1[LONG_STRING]; char buf1[LONG_STRING];
char buf2[LONG_STRING]; char buf2[LONG_STRING];
char *fp_fmt[] = { char *fp_fmt[] = {
/* %f formats */
"%f",
"%-1.5f", "%-1.5f",
"%1.5f", "%1.5f",
"%123.9f", "%123.9f",
@ -929,13 +944,28 @@ main (void)
"%3.2f", "%3.2f",
"%.0f", "%.0f",
"%.1f", "%.1f",
"%-1.5g", "%#10.1f",
#if SIZEOF_LONG_LONG != 0
"%.16f",
"%18.16f",
"%-16.16f",
#endif
/* %g formats */
"%g",
"%1.5g", "%1.5g",
"%-1.5g",
"%.9g",
"%123.9g", "%123.9g",
"%#123.9g",
#if SIZEOF_LONG_LONG != 0
"%.16g",
"%20.16g",
#endif
NULL NULL
}; };
double fp_nums[] = { -1.5, 134.21, 91340.2, 341.1234, 0203.9, 0.96, 0.996, double fp_nums[] = { -1.5, 134.21, 91340.2, 341.1234, 0203.9, 0.96, 0.996,
0.9996, 1.996, 4.136, 0.00205, 0}; 0.9996, 1.996, 4.136, 0.00205, 0.0001, 321.000009,
0};
char *int_fmt[] = { char *int_fmt[] = {
"%-1.5d", "%-1.5d",
"%1.5d", "%1.5d",