about summary refs log tree commit diff
path: root/locale/setlocale.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-01-28 16:49:20 +0000
committerUlrich Drepper <drepper@redhat.com>1999-01-28 16:49:20 +0000
commit744541835ff4c65c32cf5ce4c08b070d5f50d0ba (patch)
tree4adfa9f97c03e31d0aad5fe6f1fe30227385fb9c /locale/setlocale.c
parente6df9a569331c30b85a629d3312443454273848b (diff)
downloadglibc-744541835ff4c65c32cf5ce4c08b070d5f50d0ba.tar.gz
glibc-744541835ff4c65c32cf5ce4c08b070d5f50d0ba.tar.xz
glibc-744541835ff4c65c32cf5ce4c08b070d5f50d0ba.zip
Update.
	* locale/setlocale.c (free_mem): Don't try to free C locale data
	and use setdata instead of doing it by hand.

	* iconv/gconv_conf.c (add_alias): Check that so such alias is
	currently stored.

	* iconv/gconv_db.c (free_derivation): Free names if charsets for
	first and last step.
Diffstat (limited to 'locale/setlocale.c')
-rw-r--r--locale/setlocale.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/locale/setlocale.c b/locale/setlocale.c
index 0f685bc355..dee83d7fb4 100644
--- a/locale/setlocale.c
+++ b/locale/setlocale.c
@@ -402,9 +402,13 @@ free_mem (void)
     {
       struct locale_data *here = *_nl_current[category];
 
+      /* If this category is already "C" don't do anything.  */
+      if (here == _nl_C[category])
+	continue;
+
       /* We have to be prepared that sometime later me still might
 	 need the locale information.  */
-      *_nl_current[category] = _nl_C[category];
+      setdata (category, _nl_C[category]);
       setname (category, _nl_C_name);
 
       _nl_unload_locale (here);