From e46309e103f0a7aa08f54eca387789e73afd15af Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 23 Nov 1999 06:01:02 +0000 Subject: Update. * wcsmbs/wcsmbsload.c (__wcsmbs_load_conv): Don't use the charset name from the locale name. Only use the value in the LC_CTYPE locale data file. --- wcsmbs/wcsmbsload.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'wcsmbs') diff --git a/wcsmbs/wcsmbsload.c b/wcsmbs/wcsmbsload.c index bbac7942a1..26633e0de2 100644 --- a/wcsmbs/wcsmbsload.c +++ b/wcsmbs/wcsmbsload.c @@ -194,14 +194,8 @@ __wcsmbs_load_conv (const struct locale_data *new_category) __gconv_close_transform (__wcsmbs_gconv_fcts.tomb, 1); __gconv_close_transform (__wcsmbs_gconv_fcts.towc, 1); - /* Get name of charset of the locale. We first examine - whether we have a character set mentioned in the locale - name. If this isn't the case we use the information from - the locale files. */ - charset_name = extract_charset_name (setlocale (LC_CTYPE, NULL)); - if (charset_name == NULL) - charset_name = - new_category->values[_NL_ITEM_INDEX(CODESET)].string; + /* Get name of charset of the locale. */ + charset_name = new_category->values[_NL_ITEM_INDEX(CODESET)].string; /* Normalize the name and add the slashes necessary for a complete lookup. */ -- cgit v1.2.3