diff options
| author | tjr <tjr@FreeBSD.org> | 2004-05-22 15:19:41 +0000 |
|---|---|---|
| committer | tjr <tjr@FreeBSD.org> | 2004-05-22 15:19:41 +0000 |
| commit | f5a461b2700c74383086e755fdaed26dc05d848c (patch) | |
| tree | f6b3a5846b5b7d1a722dc68d0c48e70c32df2e55 /lib/libc/stdio/fputwc.c | |
| parent | 90c5701a2cddfda7b43823be60c581ef7dbd9bf0 (diff) | |
| download | FreeBSD-src-f5a461b2700c74383086e755fdaed26dc05d848c.zip FreeBSD-src-f5a461b2700c74383086e755fdaed26dc05d848c.tar.gz | |
Associate a multibyte conversion state object with each stream. Reset it
to the initial state when a stream is opened or seeked upon. Use the
stream's conversion state object instead of a freshly-zeroed one in
fgetwc(), fputwc() and ungetwc().
This is only a performance improvement for now, but it would also be
required in order to support state-dependent encodings.
Diffstat (limited to 'lib/libc/stdio/fputwc.c')
| -rw-r--r-- | lib/libc/stdio/fputwc.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/libc/stdio/fputwc.c b/lib/libc/stdio/fputwc.c index f1e6bf1..3f3984d 100644 --- a/lib/libc/stdio/fputwc.c +++ b/lib/libc/stdio/fputwc.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002 Tim J. Robbins. + * Copyright (c) 2002-2004 Tim J. Robbins. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -43,8 +43,6 @@ __FBSDID("$FreeBSD$"); wint_t __fputwc(wchar_t wc, FILE *fp) { - static const mbstate_t initial; - mbstate_t mbs; char buf[MB_LEN_MAX]; size_t i, len; @@ -57,8 +55,8 @@ __fputwc(wchar_t wc, FILE *fp) *buf = (unsigned char)wc; len = 1; } else { - mbs = initial; - if ((len = wcrtomb(buf, wc, &mbs)) == (size_t)-1) { + if ((len = wcrtomb(buf, wc, &fp->_extra->mbstate)) == + (size_t)-1) { fp->_flags |= __SERR; return (WEOF); } |
