summaryrefslogtreecommitdiff
path: root/lib/libc/stdio
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2008-11-16 16:26:01 +0000
committerchristos <christos@NetBSD.org>2008-11-16 16:26:01 +0000
commite1e5353bbeb89f2e4fbd12f2c6b712d6c995fa16 (patch)
treefbb1bbdc2b68cfbb18bbbfc2f9bd639b0ad356dc /lib/libc/stdio
parent38cbe1484b2d0d5c6cef3ee3abae24aecb5a0611 (diff)
PR/39347: floating and long double conversions were ifdef'ed out because
we did not have wcstold and wcstof back then. But this was done incorrectly because we did not move the argument vector. Enable them now.
Diffstat (limited to 'lib/libc/stdio')
-rw-r--r--lib/libc/stdio/vfwscanf.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/libc/stdio/vfwscanf.c b/lib/libc/stdio/vfwscanf.c
index 24d63862d84..91479142b6b 100644
--- a/lib/libc/stdio/vfwscanf.c
+++ b/lib/libc/stdio/vfwscanf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: vfwscanf.c,v 1.3 2008/08/28 16:41:21 christos Exp $ */
+/* $NetBSD: vfwscanf.c,v 1.4 2008/11/16 16:26:01 christos Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -42,7 +42,7 @@
static char sccsid[] = "@(#)ftell.c 8.2 (Berkeley) 5/4/95";
__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwscanf.c,v 1.12 2004/05/02 20:13:29 obrien Exp $");
#else
-__RCSID("$NetBSD: vfwscanf.c,v 1.3 2008/08/28 16:41:21 christos Exp $");
+__RCSID("$NetBSD: vfwscanf.c,v 1.4 2008/11/16 16:26:01 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -712,20 +712,16 @@ literal:
if ((width = parsefloat(fp, buf, buf + width)) == 0)
goto match_failure;
if ((flags & SUPPRESS) == 0) {
-#ifdef notyet
if (flags & LONGDBL) {
long double res = wcstold(buf, &p);
*va_arg(ap, long double *) = res;
} else
-#endif
if (flags & LONG) {
double res = wcstod(buf, &p);
*va_arg(ap, double *) = res;
-#ifdef notyet
} else {
float res = wcstof(buf, &p);
*va_arg(ap, float *) = res;
-#endif
}
#ifdef DEBUG
if (p - buf != width)