diff options
| author | Manuel Novoa III <mjn3@codepoet.org> | 2004-02-11 23:48:50 +0000 |
|---|---|---|
| committer | Manuel Novoa III <mjn3@codepoet.org> | 2004-02-11 23:48:50 +0000 |
| commit | 082e680bd54e999f2bb4eb77141958938b1e9ee9 (patch) | |
| tree | 203c45b85ca608e1550d8ffc459456fc9cf0b30b /libc/stdlib/stdlib.c | |
| parent | 17c21765b4a97c6f0b74ba8466073e5a3f97cdee (diff) | |
New stdio core. Should be more maintainable. Fixes a couple of bugs.
Codepaths streamlined. Improved performance for nonthreaded apps
when linked with a thread-enabled libc.
Minor iconv bug and some locale/thread related startup issues fixed.
These showed up in getting a gcj-compiled java helloworld app running.
Removed some old extension functions... _stdio_fdout and _stdio_fsfopen.
Diffstat (limited to 'libc/stdlib/stdlib.c')
| -rw-r--r-- | libc/stdlib/stdlib.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libc/stdlib/stdlib.c b/libc/stdlib/stdlib.c index c31f5f251..9e78fb24e 100644 --- a/libc/stdlib/stdlib.c +++ b/libc/stdlib/stdlib.c @@ -863,7 +863,7 @@ int mblen(register const char *s, size_t n) size_t r; if (!s) { - state.mask = 0; + state.__mask = 0; #ifdef __CTYPE_HAS_UTF_8_LOCALES return ENCODING == __ctype_encoding_utf8; #else @@ -873,7 +873,7 @@ int mblen(register const char *s, size_t n) if ((r = mbrlen(s, n, &state)) == (size_t) -2) { /* TODO: Should we set an error state? */ - state.wc = 0xffffU; /* Make sure we're in an error state. */ + state.__wc = 0xffffU; /* Make sure we're in an error state. */ return (size_t) -1; /* TODO: Change error code above? */ } return r; @@ -889,7 +889,7 @@ int mbtowc(wchar_t *__restrict pwc, register const char *__restrict s, size_t n) size_t r; if (!s) { - state.mask = 0; + state.__mask = 0; #ifdef __CTYPE_HAS_UTF_8_LOCALES return ENCODING == __ctype_encoding_utf8; #else @@ -899,7 +899,7 @@ int mbtowc(wchar_t *__restrict pwc, register const char *__restrict s, size_t n) if ((r = mbrtowc(pwc, s, n, &state)) == (size_t) -2) { /* TODO: Should we set an error state? */ - state.wc = 0xffffU; /* Make sure we're in an error state. */ + state.__wc = 0xffffU; /* Make sure we're in an error state. */ return (size_t) -1; /* TODO: Change error code above? */ } return r; @@ -932,7 +932,7 @@ size_t mbstowcs(wchar_t * __restrict pwcs, const char * __restrict s, size_t n) mbstate_t state; const char *e = s; /* Needed because of restrict. */ - state.mask = 0; /* Always start in initial shift state. */ + state.__mask = 0; /* Always start in initial shift state. */ return mbsrtowcs(pwcs, &e, n, &state); } |