Libc-763.11.tar.gz

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

diff --git a/stdio/FreeBSD/fgetws.c b/stdio/FreeBSD/fgetws.c
index be180c9f4771add62f3987c7298a4dee4c66a92e..eaaa0f85870fa31d6dc8430b39e69ef9a25d8e49 100644 (file)
--- a/stdio/FreeBSD/fgetws.c
+++ b/stdio/FreeBSD/fgetws.c
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetws.c,v 1.6 2004/10/03 15:48:32 stefanf Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetws.c,v 1.8 2009/11/25 04:45:45 wollman Exp $");
 
 #include "namespace.h"
 #include <errno.h>
@@ -62,7 +62,7 @@ fgetws(wchar_t * __restrict ws, int n, FILE * __restrict fp)
                nl = memchr(fp->_p, '\n', fp->_r);
                nconv = __mbsnrtowcs(wsp, &src,
                    nl != NULL ? (nl - fp->_p + 1) : fp->_r,
-                   n - 1, &fp->_extra->mbstate);
+                   n - 1, &fp->_mbstate);
                if (nconv == (size_t)-1)
                        /* Conversion error */
                        goto error;
@@ -86,10 +86,10 @@ fgetws(wchar_t * __restrict ws, int n, FILE * __restrict fp)
        if (wsp == ws)
                /* EOF */
                goto error;
-       if (!__mbsinit(&fp->_extra->mbstate))
+       if (!__mbsinit(&fp->_mbstate))
                /* Incomplete character */
                goto error;
-       *wsp++ = L'\0';
+       *wsp = L'\0';
        FUNLOCKFILE(fp);
 
        return (ws);