qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iconv: Use __twalk_r in __gconv_release_shlib

This commit is contained in:
Florian Weimer 2019-06-04 14:05:44 +02:00
parent 4802be92c8
commit e863dbf6b2
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2019-06-04 Florian Weimer <fweimer@redhat.com>
* iconv/gconv_dl.c (release_handle): Remove file-level definition.
(do_release_shlib): Adjust for __twalk_r.
(__gconv_release_shlib): Call __twalk_r.
2019-06-04 Andreas Schwab <schwab@suse.de> 2019-06-04 Andreas Schwab <schwab@suse.de>
[BZ #18830] [BZ #18830]

14
iconv/gconv_dl.c
View File

@ -149,15 +149,10 @@ __gconv_find_shlib (const char *name)
return found; return found;
} }
/* This is very ugly but the tsearch functions provide no way to pass
information to the walker function. So we use a global variable.
It is MT safe since we use a lock. */
static struct __gconv_loaded_object *release_handle;
static void static void
do_release_shlib (void *nodep, VISIT value, int level) do_release_shlib (const void *nodep, VISIT value, void *closure)
{ {
struct __gconv_loaded_object *release_handle = closure;
struct __gconv_loaded_object *obj = *(struct __gconv_loaded_object **) nodep; struct __gconv_loaded_object *obj = *(struct __gconv_loaded_object **) nodep;
if (value != preorder && value != leaf) if (value != preorder && value != leaf)
@ -184,13 +179,10 @@ do_release_shlib (void *nodep, VISIT value, int level)
void void
__gconv_release_shlib (struct __gconv_loaded_object *handle) __gconv_release_shlib (struct __gconv_loaded_object *handle)
{ {
/* Urgh, this is ugly but we have no other possibility. */
release_handle = handle;
/* Process all entries. Please note that we also visit entries /* Process all entries. Please note that we also visit entries
with release counts <= 0. This way we can finally unload them with release counts <= 0. This way we can finally unload them
if necessary. */ if necessary. */
__twalk (loaded, (__action_fn_t) do_release_shlib); __twalk_r (loaded, do_release_shlib, handle);
} }