about summary refs log tree commit diff
path: root/stdio-common/printf_fphex.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-08-03 09:36:43 +0000
committerUlrich Drepper <drepper@redhat.com>2006-08-03 09:36:43 +0000
commit9c06eb66b5b4662c22532ab03525eab46c4cf2eb (patch)
tree7f7e94cb6fe44805bab472b7d839e909c360315e /stdio-common/printf_fphex.c
parenta14219efc11f7f4f0cf6bea92be9e43f91118012 (diff)
downloadglibc-9c06eb66b5b4662c22532ab03525eab46c4cf2eb.tar.gz
glibc-9c06eb66b5b4662c22532ab03525eab46c4cf2eb.tar.xz
glibc-9c06eb66b5b4662c22532ab03525eab46c4cf2eb.zip
[BZ #2908]
	* stdio-common/printf_fphex.c (__printf_fphex): When rounding up
	'f', use '1' as leading digit not '\1'.
	* stdio-common/Makefile (tests): Add bug16.
	* stdio-common/bug16.c: New file.

	[BZ #2914]
	* sysdeps/unix/sysv/linux/gethostid.c: Don't define OLD_HOSTIDFILE
	and don't try to open it.  The patch introducing the macro
	contained a bug and used the same file name as the new file
	instead of using /var/adm/hostid.  Nobody complaint so I'm taking
	this out completely.

	[BZ #2926]
	* assert/assert.h: Move cast to void inside ?: to quiet gcc.
	Patch by Jerry James <Jerry.James@usu.edu>.
Diffstat (limited to 'stdio-common/printf_fphex.c')
-rw-r--r--stdio-common/printf_fphex.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/stdio-common/printf_fphex.c b/stdio-common/printf_fphex.c
index fd790d5bf3..6711ccc82b 100644
--- a/stdio-common/printf_fphex.c
+++ b/stdio-common/printf_fphex.c
@@ -1,5 +1,5 @@
 /* Print floating point number in hexadecimal notation according to ISO C99.
-   Copyright (C) 1997-2002,2004 Free Software Foundation, Inc.
+   Copyright (C) 1997-2002,2004,2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -399,11 +399,11 @@ __printf_fphex (FILE *fp,
 		++leading;
 	      else
 		{
-		  leading = 1;
+		  leading = '1';
 		  if (expnegative)
 		    {
-		      exponent += 4;
-		      if (exponent >= 0)
+		      exponent -= 4;
+		      if (exponent <= 0)
 			expnegative = 0;
 		    }
 		  else