system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-20 08:44:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge vfscanf.c, v1.37:

Browse source 
- s/#ifdef FLOATING_POINT/#ifndef NO_FLOATING_POINT/
This commit is contained in:
David Schultz 2004-05-02 10:56:26 +00:00
parent ce2551ad29
commit 30d3088041
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=128822
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/libc/stdio/vfwscanf.c
View file

@ -39,7 +39,8 @@
#if defined(LIBC_SCCS) && !defined(lint)
static char sccsid[] = "@(#)vfscanf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
__FBSDID("FreeBSD: src/lib/libc/stdio/vfscanf.c,v 1.35 2004/01/31 23:16:09 das Exp ");
__FBSDID("FreeBSD: src/lib/libc/stdio/vfscanf.c,v 1.37 2004/05/02 10:55:05 das
Exp");
#endif
__FBSDID("$FreeBSD$");
@ -58,9 +59,7 @@ __FBSDID("$FreeBSD$");
#include "libc_private.h"
#include "local.h"
#define FLOATING_POINT
#ifdef FLOATING_POINT
#ifndef NO_FLOATING_POINT
#include <locale.h>
#endif
@ -263,7 +262,7 @@ again: c = *fmt++;
base = 16;
break;
#ifdef FLOATING_POINT
#ifndef NO_FLOATING_POINT
case 'A': case 'E': case 'F': case 'G':
case 'a': case 'e': case 'f': case 'g':
c = CT_FLOAT;
@ -690,7 +689,7 @@ again: c = *fmt++;
nconversions++;
break;
#ifdef FLOATING_POINT
#ifndef NO_FLOATING_POINT
case CT_FLOAT:
/* scan a floating point number as if by strtod */
if (width == 0 || width > sizeof(buf) /
@ -716,7 +715,7 @@ again: c = *fmt++;
nread += width;
nconversions++;
break;
#endif /* FLOATING_POINT */
#endif /* !NO_FLOATING_POINT */
}
}
input_failure:
@ -725,7 +724,7 @@ again: c = *fmt++;
return (nassigned);
}
#ifdef FLOATING_POINT
#ifndef NO_FLOATING_POINT
static int
parsefloat(FILE *fp, wchar_t *buf, wchar_t *end)
{