about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-04-27 19:29:06 +0000
committerUlrich Drepper <drepper@redhat.com>2007-04-27 19:29:06 +0000
commit109f51f2b2f3331cccc1027f00ef0c752c4ffdaf (patch)
tree279f3bb5b4d2a6080def2a43a3d73a9fe9a0d364
parentbd9be6797769ae747e28bda38fd36ca8643c4298 (diff)
downloadglibc-109f51f2b2f3331cccc1027f00ef0c752c4ffdaf.tar.gz
glibc-109f51f2b2f3331cccc1027f00ef0c752c4ffdaf.tar.xz
glibc-109f51f2b2f3331cccc1027f00ef0c752c4ffdaf.zip
[BZ #4342]
2007-04-27  Ulrich Drepper  <drepper@redhat.com>
	[BZ #4342]
	* stdio-common/vfscanf.c (_IO_vfscanf_internal): Allow
	hexa-decimal floats without exponent.
	* stdio-common/tstscanf.c (main): Adjust Test 8 test for success.

	* iconv/gconv_charset.h (strip): Allow ':'.
-rw-r--r--ChangeLog9
-rw-r--r--stdio-common/tstscanf.c4
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 24e61e29db..c1e7944053 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-27  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #4342]
+	* stdio-common/vfscanf.c (_IO_vfscanf_internal): Allow
+	hexa-decimal floats without exponent.
+	* stdio-common/tstscanf.c (main): Adjust Test 8 test for success.
+
 2007-04-25  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/linux/bits/sched.h: Declare sched_getcpu.
@@ -16,7 +23,7 @@
 2007-04-25  Ulrich Drepper  <drepper@redhat.com>
 
 	[BZ #4406]
-	* iconv/gconv_charset.h (strip): Allow ':'
+	* iconv/gconv_charset.h (strip): Allow ':'.
 	* iconv/iconv_open.c (iconv_open): Adjust comment.
 
 2007-04-25  Jakub Jelinek  <jakub@redhat.com>
diff --git a/stdio-common/tstscanf.c b/stdio-common/tstscanf.c
index 44ddf49e15..123d733e3f 100644
--- a/stdio-common/tstscanf.c
+++ b/stdio-common/tstscanf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,96,97,98,99,2000,2001 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,1996-2001,2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -272,7 +272,7 @@ main (int argc, char **argv)
     res = sscanf ("0x1234", "%lf", &d);
     printf ("res = %d, d = %f\n", res, d);
 
-    if (res != 0 || d != 123456.789)
+    if (res != 1 || d != 4660)
       {
 	fputs ("test failed!\n", stdout);
 	result = 1;