Loading...
--- Libc/Libc-1725.40.4/stdio/FreeBSD/fscanf.c
+++ Libc/Libc-583/stdio/FreeBSD/fscanf.c
@@ -13,6 +13,10 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the University of
+ * California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
@@ -34,9 +38,7 @@
static char sccsid[] = "@(#)fscanf.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fscanf.c,v 1.13 2007/01/09 00:28:06 imp Exp $");
-
-#include "xlocale_private.h"
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fscanf.c,v 1.12 2003/01/03 23:27:27 tjr Exp $");
#include "namespace.h"
#include <stdio.h>
@@ -44,7 +46,6 @@
#include "un-namespace.h"
#include "libc_private.h"
#include "local.h"
-#include "libc_hooks_impl.h"
int
fscanf(FILE * __restrict fp, char const * __restrict fmt, ...)
@@ -52,29 +53,10 @@
int ret;
va_list ap;
- libc_hooks_will_write(fp, sizeof(*fp));
-
va_start(ap, fmt);
FLOCKFILE(fp);
- ret = __svfscanf_l(fp, __current_locale(), fmt, ap);
+ ret = __svfscanf(fp, fmt, ap);
va_end(ap);
FUNLOCKFILE(fp);
return (ret);
}
-
-int
-fscanf_l(FILE * __restrict fp, locale_t loc, char const * __restrict fmt, ...)
-{
- int ret;
- va_list ap;
-
- libc_hooks_will_write(fp, sizeof(*fp));
-
- NORMALIZE_LOCALE(loc);
- va_start(ap, fmt);
- FLOCKFILE(fp);
- ret = __svfscanf_l(fp, loc, fmt, ap);
- va_end(ap);
- FUNLOCKFILE(fp);
- return (ret);
-}