diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 18:56:13 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 18:57:13 +0000 |
commit | 82dd75a7f436a19047325d62182590c9f9e23a78 (patch) | |
tree | 60ca20c8cf2b0d178d84725c0715471f76df97e1 /iconv/gconv_dl.c | |
parent | 0bbb676a2342367c4e52b35e890f24667dabb348 (diff) | |
parent | 963c37d5c0eb62b38f8764b23931c0dcdd497a13 (diff) |
Merge commit 'refs/top-bases/t/tls' into t/tls
Diffstat (limited to 'iconv/gconv_dl.c')
-rw-r--r-- | iconv/gconv_dl.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/iconv/gconv_dl.c b/iconv/gconv_dl.c index 4e9dfea437..de00e1319d 100644 --- a/iconv/gconv_dl.c +++ b/iconv/gconv_dl.c @@ -1,5 +1,5 @@ /* Handle loading/unloading of shared object for transformation. - Copyright (C) 1997-2016 Free Software Foundation, Inc. + Copyright (C) 1997-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -64,7 +64,6 @@ known_compare (const void *p1, const void *p2) /* Open the gconv database if necessary. A non-negative return value means success. */ struct __gconv_loaded_object * -internal_function __gconv_find_shlib (const char *name) { struct __gconv_loaded_object *found; @@ -131,10 +130,8 @@ __gconv_find_shlib (const char *name) #ifdef PTR_MANGLE PTR_MANGLE (found->fct); - if (found->init_fct != NULL) - PTR_MANGLE (found->init_fct); - if (found->end_fct != NULL) - PTR_MANGLE (found->end_fct); + PTR_MANGLE (found->init_fct); + PTR_MANGLE (found->end_fct); #endif /* We have succeeded in loading the shared object. */ @@ -185,7 +182,6 @@ do_release_shlib (void *nodep, VISIT value, int level) /* Notify system that a shared object is not longer needed. */ void -internal_function __gconv_release_shlib (struct __gconv_loaded_object *handle) { /* Urgh, this is ugly but we have no other possibility. */ |