diff options
| author | tjr <tjr@FreeBSD.org> | 2003-11-04 11:05:55 +0000 |
|---|---|---|
| committer | tjr <tjr@FreeBSD.org> | 2003-11-04 11:05:55 +0000 |
| commit | 46a574efa9d64e0719dd8846de8e06a157dbd4ff (patch) | |
| tree | de1efe529ace379f46b768f97f638aa004be19ea /lib/libc/stdio/fputwc.c | |
| parent | a69e97d1cc1b9b78983d8e402ba00aa348d02701 (diff) | |
| download | FreeBSD-src-46a574efa9d64e0719dd8846de8e06a157dbd4ff.zip FreeBSD-src-46a574efa9d64e0719dd8846de8e06a157dbd4ff.tar.gz | |
Pass mbrtowc() and wcrtomb() NULL instead of a pointer to a freshly zeroed
mbstate_t object that they ignore. The zeroing is fairly expensive, and it
will never be necessary in these functions; when we support state-dependent
encodings, we will pass in a pointer to the file's mbstate_t object, and
only zero it at the time the file gets opened.
Diffstat (limited to 'lib/libc/stdio/fputwc.c')
| -rw-r--r-- | lib/libc/stdio/fputwc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/libc/stdio/fputwc.c b/lib/libc/stdio/fputwc.c index ed1f11b..ba3c5bb 100644 --- a/lib/libc/stdio/fputwc.c +++ b/lib/libc/stdio/fputwc.c @@ -44,7 +44,6 @@ wint_t __fputwc(wchar_t wc, FILE *fp) { char buf[MB_LEN_MAX]; - mbstate_t mbs; size_t i, len; if (MB_CUR_MAX == 1 && wc > 0 && wc <= UCHAR_MAX) { @@ -56,8 +55,7 @@ __fputwc(wchar_t wc, FILE *fp) *buf = (unsigned char)wc; len = 1; } else { - memset(&mbs, 0, sizeof(mbs)); - if ((len = wcrtomb(buf, wc, &mbs)) == (size_t)-1) { + if ((len = wcrtomb(buf, wc, NULL)) == (size_t)-1) { fp->_flags |= __SERR; return (WEOF); } |
