summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-07-29 00:26:28 +0000
committerUlrich Drepper <drepper@redhat.com>2007-07-29 00:26:28 +0000
commit8f5e140031a944855846eb745c13e013c7b5539f (patch)
treeebf93fde53644a22e996f859192d2ce81d87c995
parentcedb4109571cff4416235df260848de77f09f556 (diff)
downloadglibc-8f5e140031a944855846eb745c13e013c7b5539f.tar.gz
[BZ 4858]
* stdio-common/printf_fp.c (___printf_fp): Fix special case of #.0g and value rounded to 1.0. * stdio-common/tfformat.c (sprint_doubles): Add two new tests.
-rw-r--r--ChangeLog7
-rw-r--r--stdio-common/printf_fp.c4
-rw-r--r--stdio-common/tfformat.c3
3 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 15c5e84074..754eea77b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-28 Ulrich Drepper <drepper@redhat.com>
+
+ [BZ 4858]
+ * stdio-common/printf_fp.c (___printf_fp): Fix special case of
+ #.0g and value rounded to 1.0.
+ * stdio-common/tfformat.c (sprint_doubles): Add two new tests.
+
2007-07-26 Jakub Jelinek <jakub@redhat.com>
* locale/programs/ld-monetary.c (monetary_finish): Avoid range check
diff --git a/stdio-common/printf_fp.c b/stdio-common/printf_fp.c
index 6e5ff5855b..ae25ab6fc5 100644
--- a/stdio-common/printf_fp.c
+++ b/stdio-common/printf_fp.c
@@ -986,7 +986,9 @@ ___printf_fp (FILE *fp,
if (*wtp != decimalwc)
/* Round up. */
(*wtp)++;
- else if (__builtin_expect (spec == 'g' && type == 'f' && info->alt,
+ else if (__builtin_expect (spec == 'g' && type == 'f' && info->alt
+ && wtp == wstartp + 1
+ && wstartp[0] == L'0',
0))
/* This is a special case: the rounded number is 1.0,
the format is 'g' or 'G', and the alternative format
diff --git a/stdio-common/tfformat.c b/stdio-common/tfformat.c
index d67b3b504d..f9b5f7655b 100644
--- a/stdio-common/tfformat.c
+++ b/stdio-common/tfformat.c
@@ -4024,6 +4024,9 @@ sprint_double_type sprint_doubles[] =
{__LINE__, 1.0, "1.000000e+00", "%e"},
{__LINE__, .9999999999999999, "1.000000e+00", "%e"},
+ {__LINE__, 912.98, "913.0", "%#.4g"},
+ {__LINE__, 50.999999, "51.000", "%#.5g"},
+
{0 }
};