Loading...
stdio/FreeBSD/vswprintf.c Libc-825.24 Libc-763.13
--- Libc/Libc-825.24/stdio/FreeBSD/vswprintf.c
+++ Libc/Libc-763.13/stdio/FreeBSD/vswprintf.c
@@ -33,8 +33,6 @@
 #endif
 __FBSDID("$FreeBSD: src/lib/libc/stdio/vswprintf.c,v 1.7 2008/04/17 22:17:54 jhb Exp $");
 
-#include "xlocale_private.h"
-
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -42,8 +40,8 @@
 #include "local.h"
 
 int
-vswprintf_l(wchar_t * __restrict s, size_t n, locale_t loc,
-    const wchar_t * __restrict fmt, __va_list ap)
+vswprintf(wchar_t * __restrict s, size_t n, const wchar_t * __restrict fmt,
+    __va_list ap)
 {
 	static const mbstate_t initial;
 	mbstate_t mbs;
@@ -51,11 +49,7 @@
 	char *mbp;
 	int ret, sverrno;
 	size_t nwc;
-	struct __sFILEX ext;
-	f._extra = &ext;
-	INITEXTRA(&f);
 
-	NORMALIZE_LOCALE(loc);
 	if (n == 0) {
 		errno = EINVAL;
 		return (-1);
@@ -71,7 +65,7 @@
 	f._bf._size = f._w = 127;		/* Leave room for the NUL */
 	f._orientation = 0;
 	memset(&f._mbstate, 0, sizeof(mbstate_t));
-	ret = __vfwprintf(&f, loc, fmt, ap);
+	ret = __vfwprintf(&f, fmt, ap);
 	if (ret < 0) {
 		sverrno = errno;
 		free(f._bf._base);
@@ -85,7 +79,7 @@
 	 * fputwc() did in __vfwprintf().
 	 */
 	mbs = initial;
-	nwc = mbsrtowcs_l(s, (const char **)&mbp, n, &mbs, loc);
+	nwc = mbsrtowcs(s, (const char **)&mbp, n, &mbs);
 	free(f._bf._base);
 	if (nwc == (size_t)-1) {
 		errno = EILSEQ;
@@ -99,10 +93,3 @@
 
 	return (ret);
 }
-
-int
-vswprintf(wchar_t * __restrict s, size_t n,
-    const wchar_t * __restrict fmt, __va_list ap)
-{
-	return vswprintf_l(s, n, __current_locale(), fmt, ap);
-}