aboutsummaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-07-27 17:34:53 +0000
committerUlrich Drepper <drepper@redhat.com>2001-07-27 17:34:53 +0000
commit9a018f6c44b7393e4ac1f57d504b9c054e2d0533 (patch)
tree824941e3d79629e9609554717a5099d086b2ab3e /locale
parent97b0f3d3a715c8486d48a26933260af9028a8bdb (diff)
downloadglibc-9a018f6c44b7393e4ac1f57d504b9c054e2d0533.zip
glibc-9a018f6c44b7393e4ac1f57d504b9c054e2d0533.tar.gz
glibc-9a018f6c44b7393e4ac1f57d504b9c054e2d0533.tar.bz2
Update.
2001-07-27 Ulrich Drepper <drepper@redhat.com> * iconv/gconv_cache.c (__gconv_compare_alias_cache): New function. * iconv/gconv_int.h: Add prototype for __gconv_compare_alias_cache. * iconv/gconv_charset.h: Replace __gconv_lookup_alias prototype with __gconv_compare_alias prototype. * iconv/gconv_db.c (__gconv_lookup_alias): Removed. (__gconv_compare_alias): New function. * locale/findlocale.c (_nl_find_locale): Ise __gconv_compare_alias instead of calling __gconv_lookup_alias twice and compare here.
Diffstat (limited to 'locale')
-rw-r--r--locale/findlocale.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/locale/findlocale.c b/locale/findlocale.c
index 2770258..59b9992 100644
--- a/locale/findlocale.c
+++ b/locale/findlocale.c
@@ -207,9 +207,9 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len,
ccodeset = (char *) alloca (strlen (codeset) + 3);
strip (ccodeset, codeset);
- if (strcmp (__gconv_lookup_alias (upstr (ccodeset, ccodeset)),
- __gconv_lookup_alias (upstr (clocale_codeset,
- clocale_codeset))) != 0)
+ if (__gconv_compare_alias (upstr (ccodeset, ccodeset),
+ upstr (clocale_codeset,
+ clocale_codeset)) != 0)
/* The codesets are not identical, don't use the locale. */
return NULL;
}