From 744541835ff4c65c32cf5ce4c08b070d5f50d0ba Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 28 Jan 1999 16:49:20 +0000 Subject: 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. --- iconv/gconv_dl.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'iconv/gconv_dl.c') diff --git a/iconv/gconv_dl.c b/iconv/gconv_dl.c index 5650389c78..33f0efea90 100644 --- a/iconv/gconv_dl.c +++ b/iconv/gconv_dl.c @@ -254,17 +254,15 @@ __gconv_release_shlib (struct gconv_loaded_object *handle) /* We run this if we debug the memory allocation. */ static void -do_release_all (const void *nodep, VISIT value, int level) +do_release_all (void *nodep) { - struct gconv_loaded_object *obj = *(struct gconv_loaded_object **) nodep; - - if (value != preorder && value != leaf) - return; + struct gconv_loaded_object *obj = (struct gconv_loaded_object *) nodep; /* Unload the shared object. We don't use the trick to catch errors since in the case an error is signalled something is really wrong. */ - _dl_close (obj->handle); + if (obj->handle != NULL) + _dl_close (obj->handle); free (obj); } @@ -272,6 +270,6 @@ do_release_all (const void *nodep, VISIT value, int level) static void __attribute__ ((unused)) free_mem (void) { - __twalk (loaded, do_release_all); + __tdestroy (loaded, do_release_all); } text_set_element (__libc_subfreeres, free_mem); -- cgit v1.2.3