From 1e99aedece40907ea7f2a392f3e98df75f23011e Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 7 Apr 2008 20:03:08 +0000 Subject: [PATCH] * 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 * 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. --- ChangeLog | 12 ++++++++++++ debug/wctomb_chk.c | 6 +++--- stdlib/mbtowc.c | 11 +++++------ stdlib/wctomb.c | 10 ++++++---- 4 files changed, 26 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index e52e73dcae..bac51c5428 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2008-04-07 Jakub Jelinek + + * 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 Ulrich Drepper [BZ #5475] diff --git a/debug/wctomb_chk.c b/debug/wctomb_chk.c index d0366346b8..23fc2ffbd1 100644 --- a/debug/wctomb_chk.c +++ b/debug/wctomb_chk.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2005 Free Software Foundation, Inc. +/* Copyright (C) 2005, 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 @@ -21,7 +21,7 @@ #include -extern mbstate_t __no_r_state attribute_hidden; /* Defined in mbtowc.c. */ +extern mbstate_t __wctomb_state attribute_hidden; /* Defined in wctomb.c. */ int @@ -32,5 +32,5 @@ __wctomb_chk (char *s, wchar_t wchar, size_t buflen) if (buflen < MB_CUR_MAX) __chk_fail (); - return __wcrtomb (s, wchar, &__no_r_state); + return __wcrtomb (s, wchar, &__wctomb_state); } 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 -/* 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. */ diff --git a/stdlib/wctomb.c b/stdlib/wctomb.c index 49872f5c6b..3ba8a3e2a7 100644 --- a/stdlib/wctomb.c +++ b/stdlib/wctomb.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,7 +24,8 @@ #include -extern mbstate_t __no_r_state attribute_hidden; /* Defined in mbtowc.c. */ +/* Shared with __wctomb_chk. */ +mbstate_t __wctomb_state attribute_hidden; /* Convert WCHAR into its multibyte character representation, putting this in S and returning its length. @@ -47,11 +49,11 @@ wctomb (char *s, wchar_t wchar) /* 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 (&__wctomb_state, '\0', sizeof __wctomb_state); return fcts->tomb->__stateful; } - return __wcrtomb (s, wchar, &__no_r_state); + return __wcrtomb (s, wchar, &__wctomb_state); } libc_hidden_def (wctomb)