lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Update.

Browse Source 
* sysdeps/generic/ldsodefs.h: Don't define _dl_name_match_p as inline.
	* elf/dl-misc.c: Define _dl_name_match_p here.
	* elf/dl-open.c (check_libc_caller): Don't use _dl_name_match_p.
This commit is contained in:
Ulrich Drepper
2004-03-05 04:24:45 +00:00
parent f213ef0280
commit dd272e5774
4 changed files with 45 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
elf/dl-open.c
View File

@ -177,16 +177,32 @@ check_libc_caller (const void *caller)
struct link_map *l;
for (l = GL(dl_loaded); l != NULL; l = l->l_next)
if (_dl_name_match_p (expected1, l))
if (strcmp (expected1, l->l_name) == 0)
{
is_1:
expected1_from = (const void *) l->l_map_start;
expected1_to = (const void *) l->l_map_end;
}
else if (_dl_name_match_p (expected2, l))
else if (strcmp (expected1, l->l_name) == 0)
{
is_2:
expected2_from = (const void *) l->l_map_start;
expected2_to = (const void *) l->l_map_end;
}
else
{
struct libname_list *runp = l->l_libname;
while (runp != NULL)
{
if (strcmp (expected1, runp->name) == 0)
goto is_1;
else if (strcmp (expected2, runp->name) == 0)
goto is_2;
runp = runp->next;
}
}
assert (expected1_from != NULL);
}