diff options
Diffstat (limited to 'iconv/gconv_cache.c')
| -rw-r--r-- | iconv/gconv_cache.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/iconv/gconv_cache.c b/iconv/gconv_cache.c index 716c384de2..9b695c377d 100644 --- a/iconv/gconv_cache.c +++ b/iconv/gconv_cache.c @@ -1,5 +1,5 @@ /* Cache handling for iconv modules. - Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 2001. @@ -209,18 +209,7 @@ find_module (const char *directory, const char *filename, /* Call the init function. */ if (result->__init_fct != NULL) - { - __gconv_init_fct init_fct = result->__init_fct; -#ifdef PTR_DEMANGLE - PTR_DEMANGLE (init_fct); -#endif - status = DL_CALL_FCT (init_fct, (result)); - -#ifdef PTR_MANGLE - if (result->__btowc_fct != NULL) - PTR_MANGLE (result->__btowc_fct); -#endif - } + status = DL_CALL_FCT (result->__init_fct, (result)); } return status; @@ -467,7 +456,7 @@ libc_freeres_fn (free_mem) if (cache_malloced) free (gconv_cache); #ifdef _POSIX_MAPPED_FILES - else if (gconv_cache != NULL) + else __munmap (gconv_cache, cache_size); #endif } |