diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2008-04-07 20:03:08 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2008-04-07 20:03:08 +0000 |
| commit | 1e99aedece40907ea7f2a392f3e98df75f23011e (patch) | |
| tree | 0be45eb7a47f5cbae7c5be57c393637f4998426c /stdlib/mbtowc.c | |
| parent | fcf90e0a6fe37149f0b9000c6611d4da4d5a7a64 (diff) | |
| download | glibc-1e99aedece40907ea7f2a392f3e98df75f23011e.tar.gz glibc-1e99aedece40907ea7f2a392f3e98df75f23011e.tar.xz glibc-1e99aedece40907ea7f2a392f3e98df75f23011e.zip | |
* stdlib/mbtowc.c (__no_r_state): Remove.
(mbtowc): New static state variable. Use it instead of __no_r_state. * stdlib/wctomb.c (__no_r_state): Remove extern decl. (__wctomb_state): New hidden variable. (wctomb): Use __wctomb_state instead of __no_r_state. * debug/wctomb_chk.c (__no_r_state): Remove extern decl. (__wctomb_state): New extern decl. (__wctomb_chk): Use __wctomb_state instead of __no_r_state. 2008-04-07 Jakub Jelinek <jakub@redhat.com> * stdlib/mbtowc.c (__no_r_state): Remove. (mbtowc): New static state variable. Use it instead of __no_r_state. * stdlib/wctomb.c (__no_r_state): Remove extern decl. (__wctomb_state): New hidden variable. (wctomb): Use __wctomb_state instead of __no_r_state. * debug/wctomb_chk.c (__no_r_state): Remove extern decl. (__wctomb_state): New extern decl. (__wctomb_chk): Use __wctomb_state instead of __no_r_state.
Diffstat (limited to 'stdlib/mbtowc.c')
| -rw-r--r-- | stdlib/mbtowc.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/stdlib/mbtowc.c b/stdlib/mbtowc.c index 744b2b6c0b..ee8850bbc1 100644 --- a/stdlib/mbtowc.c +++ b/stdlib/mbtowc.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1991, 1992, 1995-1999, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1995-1999, 2002, 2008 + Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -23,9 +24,6 @@ #include <wcsmbs/wcsmbsload.h> -/* Common state for all non-restartable conversion functions. */ -mbstate_t __no_r_state attribute_hidden; - /* Convert the multibyte character at S, which is no longer than N characters, to its `wchar_t' representation, placing this n *PWC and returning its length. @@ -38,6 +36,7 @@ int mbtowc (wchar_t *pwc, const char *s, size_t n) { int result; + static mbstate_t state; /* If S is NULL the function has to return null or not null depending on the encoding having a state depending encoding or @@ -51,7 +50,7 @@ mbtowc (wchar_t *pwc, const char *s, size_t n) /* This is an extension in the Unix standard which does not directly violate ISO C. */ - memset (&__no_r_state, '\0', sizeof __no_r_state); + memset (&state, '\0', sizeof state); result = fcts->towc->__stateful; } @@ -63,7 +62,7 @@ mbtowc (wchar_t *pwc, const char *s, size_t n) } else { - result = __mbrtowc (pwc, s, n, &__no_r_state); + result = __mbrtowc (pwc, s, n, &state); /* The `mbrtowc' functions tell us more than we need. Fold the -1 and -2 result into -1. */ |