Loading...
--- Libc/Libc-825.26/stdio/FreeBSD/fputws.c
+++ Libc/Libc-763.11/stdio/FreeBSD/fputws.c
@@ -27,8 +27,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD: src/lib/libc/stdio/fputws.c,v 1.8 2009/01/15 18:53:52 rdivacky Exp $");
-#include "xlocale_private.h"
-
#include "namespace.h"
#include <errno.h>
#include <limits.h>
@@ -41,18 +39,14 @@
#include "mblocal.h"
int
-fputws_l(const wchar_t * __restrict ws, FILE * __restrict fp, locale_t loc)
+fputws(const wchar_t * __restrict ws, FILE * __restrict fp)
{
size_t nbytes;
char buf[BUFSIZ];
struct __suio uio;
struct __siov iov;
- const wchar_t *wsp = ws;
- size_t (*__wcsnrtombs)(char * __restrict, const wchar_t ** __restrict,
- size_t, size_t, mbstate_t * __restrict, locale_t);
+ const wchar_t *wsp;
- NORMALIZE_LOCALE(loc);
- __wcsnrtombs = loc->__lc_ctype->__wcsnrtombs;
FLOCKFILE(fp);
ORIENT(fp, 1);
if (prepwrite(fp) != 0)
@@ -61,14 +55,15 @@
uio.uio_iovcnt = 1;
iov.iov_base = buf;
do {
+ wsp = ws;
nbytes = __wcsnrtombs(buf, &wsp, SIZE_T_MAX, sizeof(buf),
- &fp->_mbstate, loc);
+ &fp->_mbstate);
if (nbytes == (size_t)-1)
goto error;
iov.iov_len = uio.uio_resid = nbytes;
if (__sfvwrite(fp, &uio) != 0)
goto error;
- } while (wsp != NULL);
+ } while (ws != NULL);
FUNLOCKFILE(fp);
return (0);
@@ -76,9 +71,3 @@
FUNLOCKFILE(fp);
return (-1);
}
-
-int
-fputws(const wchar_t * __restrict ws, FILE * __restrict fp)
-{
- return fputws_l(ws, fp, __current_locale());
-}