Libc-1439.100.3.tar.gz

[apple/libc.git] / stdio / FreeBSD / swscanf.c

diff --git a/stdio/FreeBSD/swscanf.c b/stdio/FreeBSD/swscanf.c
index 81ac9f1256a2beb095aa717f28fb00de3c861789..4fc850a1b7dfc8f09aa601a935748c964f744f5b 100644 (file)
--- a/stdio/FreeBSD/swscanf.c
+++ b/stdio/FreeBSD/swscanf.c
@@ -27,6 +27,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/lib/libc/stdio/swscanf.c,v 1.1 2002/09/23 12:40:06 tjr Exp $");
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/lib/libc/stdio/swscanf.c,v 1.1 2002/09/23 12:40:06 tjr Exp $");
 

+#include "xlocale_private.h"
+

 #include <stdarg.h>
 #include <stdio.h>
 #include <wchar.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <wchar.h>


@@ -38,7 +40,22 @@ swscanf(const wchar_t * __restrict str, const wchar_t * __restrict fmt, ...)
        int r;
 
        va_start(ap, fmt);
        int r;
 
        va_start(ap, fmt);

-       r = vswscanf(str, fmt, ap);
+       r = vswscanf_l(str, __current_locale(), fmt, ap);
+       va_end(ap);
+
+       return (r);
+}
+
+int
+swscanf_l(const wchar_t * __restrict str, locale_t loc,
+    const wchar_t * __restrict fmt, ...)
+{
+       va_list ap;
+       int r;
+
+       /* no need to call NORMALIZE_LOCALE(loc) because vswscanf_l will */
+       va_start(ap, fmt);
+       r = vswscanf_l(str, loc, fmt, ap);

        va_end(ap);
 
        return (r);
        va_end(ap);
 
        return (r);