about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-05-26 08:56:39 +0000
committerUlrich Drepper <drepper@redhat.com>2003-05-26 08:56:39 +0000
commit6458d81479fa8b59f5ef72f276a73a6d2aca451c (patch)
tree65ad6c97da96e13f405c1cce59cdccbf3b830406
parent69431c9a21f7393f34330a27df1630520930789e (diff)
downloadglibc-6458d81479fa8b59f5ef72f276a73a6d2aca451c.tar.gz
glibc-6458d81479fa8b59f5ef72f276a73a6d2aca451c.tar.xz
glibc-6458d81479fa8b59f5ef72f276a73a6d2aca451c.zip
Update.
2003-05-26  Ulrich Drepper  <drepper@redhat.com>

	* stdio-common/vfprintf.c (vfprintf): Be bug-compatible with some
	other implementation in respect of multiple uses of parameter with
	different types.
-rw-r--r--ChangeLog6
-rw-r--r--nptl/Banner2
-rw-r--r--stdio-common/vfprintf.c6
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d8376fbffc..26d5ae5e36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-05-26  Ulrich Drepper  <drepper@redhat.com>
+
+	* stdio-common/vfprintf.c (vfprintf): Be bug-compatible with some
+	other implementation in respect of multiple uses of parameter with
+	different types.
+
 2003-05-25  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/linux/kernel-features.h: Define
diff --git a/nptl/Banner b/nptl/Banner
index 69c9889293..9c6edf75b8 100644
--- a/nptl/Banner
+++ b/nptl/Banner
@@ -1 +1 @@
-NPTL 0.39 by Ulrich Drepper
+NPTL 0.40 by Ulrich Drepper
diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index 087bf91b21..f8e01b73a1 100644
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -1737,13 +1737,13 @@ do_positional:
 	  args_value[cnt].mem = va_arg (ap_save, type);			      \
 	  break
 
-	T (PA_CHAR, pa_char, int); /* Promoted.  */
+	T (PA_CHAR, pa_int, int); /* Promoted.  */
 	T (PA_WCHAR, pa_wchar, wint_t);
-	T (PA_INT|PA_FLAG_SHORT, pa_short_int, int); /* Promoted.  */
+	T (PA_INT|PA_FLAG_SHORT, pa_int, int); /* Promoted.  */
 	T (PA_INT, pa_int, int);
 	T (PA_INT|PA_FLAG_LONG, pa_long_int, long int);
 	T (PA_INT|PA_FLAG_LONG_LONG, pa_long_long_int, long long int);
-	T (PA_FLOAT, pa_float, double);	/* Promoted.  */
+	T (PA_FLOAT, pa_double, double);	/* Promoted.  */
 	T (PA_DOUBLE, pa_double, double);
 	T (PA_DOUBLE|PA_FLAG_LONG_DOUBLE, pa_long_double, long double);
 	T (PA_STRING, pa_string, const char *);