AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-08 06:10:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

elf: Remove struct dl_init_args from elf/dl-open.c

Browse Source 
It is completely redundant with struct dl_open_args.
This commit is contained in:
Florian Weimer 2024-08-08 13:35:03 +02:00
parent bd410d14e1
commit 2d14f72c9a
1 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
elf/dl-open.c
View File

@ -486,22 +486,11 @@ _dl_open_relocate_one_object (struct dl_open_args *args, struct r_debug *r,
_dl_relocate_object (l, l->l_scope, reloc_mode, 0);
}
/* struct dl_init_args and call_dl_init are used to call _dl_init with
exception handling disabled. */
struct dl_init_args
{
struct link_map *new;
int argc;
char **argv;
char **env;
};
static void
call_dl_init (void *closure)
{
struct dl_init_args *args = closure;
_dl_init (args->new, args->argc, args->argv, args->env);
struct dl_open_args *args = closure;
_dl_init (args->map, args->argc, args->argv, args->env);
}
static void
@ -793,16 +782,7 @@ dl_open_worker (void *a)
/* Run the initializer functions of new objects. Temporarily
disable the exception handler, so that lazy binding failures are
fatal. */
{
struct dl_init_args init_args =
{
.new = new,
.argc = args->argc,
.argv = args->argv,
.env = args->env
};
_dl_catch_exception (NULL, call_dl_init, &init_args);
}
_dl_catch_exception (NULL, call_dl_init, args);
/* Now we can make the new map available in the global scope. */
if (mode & RTLD_GLOBAL)