| | 1 | --- fwscanf.c.orig 2003-05-20 15:22:42.000000000 -0700 |
| | 2 | +++ fwscanf.c 2005-02-23 16:32:29.000000000 -0800 |
| | 3 | @@ -27,6 +27,8 @@ |
| | 4 | #include <sys/cdefs.h> |
| | 5 | __FBSDID("$FreeBSD: src/lib/libc/stdio/fwscanf.c,v 1.1 2002/09/23 12:40:06 tjr Exp $"); |
| | 6 | |
| | 7 | +#include "xlocale_private.h" |
| | 8 | + |
| | 9 | #include <stdarg.h> |
| | 10 | #include <stdio.h> |
| | 11 | #include <wchar.h> |
| | 12 | @@ -38,7 +40,21 @@ |
| | 13 | int r; |
| | 14 | |
| | 15 | va_start(ap, fmt); |
| | 16 | - r = vfwscanf(fp, fmt, ap); |
| | 17 | + r = vfwscanf_l(fp, __current_locale(), fmt, ap); |
| | 18 | + va_end(ap); |
| | 19 | + |
| | 20 | + return (r); |
| | 21 | +} |
| | 22 | + |
| | 23 | +int |
| | 24 | +fwscanf_l(FILE * __restrict fp, locale_t loc, const wchar_t * __restrict fmt, ...) |
| | 25 | +{ |
| | 26 | + va_list ap; |
| | 27 | + int r; |
| | 28 | + |
| | 29 | + /* no need to call NORMALIZE_LOCALE(loc) because vfwscanf_l will */ |
| | 30 | + va_start(ap, fmt); |
| | 31 | + r = vfwscanf_l(fp, loc, fmt, ap); |
| | 32 | va_end(ap); |
| | 33 | |
| | 34 | return (r); |
projects / apple / libc.git / blame_incremental