mirrors/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-27 11:43:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove nested functions from elf/dl-deps.c

Browse Source
This commit is contained in:
Kostya Serebryany 2014-10-01 14:34:45 -07:00
parent 6268f532b6
commit 06210a44e9
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2014-10-01 Kostya Serebryany <konstantin.s.serebryany@gmail.com>
* elf/dl-deps.c
(preload): New functions broken out of _dl_map_object_deps.
(_dl_map_object_deps): Remove a nested function. Update call sites.
2014-10-01 Joseph Myers <joseph@codesourcery.com>
[BZ #14138]

30
elf/dl-deps.c
View File

@ -138,6 +138,19 @@ cannot load auxiliary `%s' because of empty dynamic string token " \
\
__result; })
static void
preload (struct list *known, unsigned int *nlist, struct link_map *map)
{
known[*nlist].done = 0;
known[*nlist].map = map;
known[*nlist].next = &known[*nlist + 1];
++*nlist;
/* We use `l_reserved' as a mark bit to detect objects we have
already put in the search list and avoid adding duplicate
elements later in the list. */
map->l_reserved = 1;
}
void
internal_function
@ -155,28 +168,15 @@ _dl_map_object_deps (struct link_map *map,
const char *errstring;
const char *objname;
void preload (struct link_map *map)
{
known[nlist].done = 0;
known[nlist].map = map;
known[nlist].next = &known[nlist + 1];
++nlist;
/* We use `l_reserved' as a mark bit to detect objects we have
already put in the search list and avoid adding duplicate
elements later in the list. */
map->l_reserved = 1;
}
/* No loaded object so far. */
nlist = 0;
/* First load MAP itself. */
preload (map);
preload (known, &nlist, map);
/* Add the preloaded items after MAP but before any of its dependencies. */
for (i = 0; i < npreloads; ++i)
preload (preloads[i]);
preload (known, &nlist, preloads[i]);
/* Terminate the lists. */
known[nlist - 1].next = NULL;