diff options
Diffstat (limited to 'stdlib')
| -rw-r--r-- | stdlib/mblen.c | 10 | ||||
| -rw-r--r-- | stdlib/mbtowc.c | 8 | ||||
| -rw-r--r-- | stdlib/wctomb.c | 8 |
3 files changed, 16 insertions, 10 deletions
diff --git a/stdlib/mblen.c b/stdlib/mblen.c index 782bf51081..3cd9cf6909 100644 --- a/stdlib/mblen.c +++ b/stdlib/mblen.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1991,1997,1998,1999,2000,2002 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 @@ -40,13 +40,15 @@ mblen (const char *s, size_t n) not. */ if (s == NULL) { - /* Make sure we use the correct value. */ - update_conversion_ptrs (); + const struct gconv_fcts *fcts; + + /* Get the conversion functions. */ + fcts = get_gconv_fcts (_NL_CURRENT_DATA (LC_CTYPE)); /* Reset the state. */ memset (&state, '\0', sizeof state); - result = __wcsmbs_gconv_fcts.towc->__stateful; + result = fcts->towc->__stateful; } else if (*s == '\0') /* According to the ISO C 89 standard this is the expected behaviour. */ diff --git a/stdlib/mbtowc.c b/stdlib/mbtowc.c index 51fd9ab8f2..744b2b6c0b 100644 --- a/stdlib/mbtowc.c +++ b/stdlib/mbtowc.c @@ -44,14 +44,16 @@ mbtowc (wchar_t *pwc, const char *s, size_t n) not. */ if (s == NULL) { - /* Make sure we use the correct value. */ - update_conversion_ptrs (); + const struct gconv_fcts *fcts; + + /* Get the conversion functions. */ + fcts = get_gconv_fcts (_NL_CURRENT_DATA (LC_CTYPE)); /* This is an extension in the Unix standard which does not directly violate ISO C. */ memset (&__no_r_state, '\0', sizeof __no_r_state); - result = __wcsmbs_gconv_fcts.towc->__stateful; + result = fcts->towc->__stateful; } else if (*s == '\0') { diff --git a/stdlib/wctomb.c b/stdlib/wctomb.c index e6817320ae..49872f5c6b 100644 --- a/stdlib/wctomb.c +++ b/stdlib/wctomb.c @@ -40,14 +40,16 @@ wctomb (char *s, wchar_t wchar) not. */ if (s == NULL) { - /* Make sure we use the correct value. */ - update_conversion_ptrs (); + const struct gconv_fcts *fcts; + + /* Get the conversion functions. */ + fcts = get_gconv_fcts (_NL_CURRENT_DATA (LC_CTYPE)); /* This is an extension in the Unix standard which does not directly violate ISO C. */ memset (&__no_r_state, '\0', sizeof __no_r_state); - return __wcsmbs_gconv_fcts.tomb->__stateful; + return fcts->tomb->__stateful; } return __wcrtomb (s, wchar, &__no_r_state); |