AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-08 18:30:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

_dl_sort_fini: Remove unused argument

Browse Source
This commit is contained in:
Marek Polacek 2011-07-19 20:27:43 -04:00 committed by Ulrich Drepper
parent 8991e135f7
commit c8835729b8
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2011-07-14 Marek Polacek <mpolacek@redhat.com>
* elf/dl-fini.c (_dl_sort_fini): Remove unused link_map *l argument,
* elf/dl-fini.c (_dl_fini): Adjust caller.
* elf/dl-close.c (_dl_close_worker): Likewise.
* sysdeps/generic/ldsodefs.h: Adjust declaration.
2011-07-15 Marek Polacek <mpolacek@redhat.com>
* elf/cache.c (load_aux_cache): Remove unnecessary condition of

2
elf/dl-close.c
View File

@ -231,7 +231,7 @@ _dl_close_worker (struct link_map *map)
}
/* Sort the entries. */
_dl_sort_fini (ns->_ns_loaded, maps, nloaded, used, nsid);
_dl_sort_fini (maps, nloaded, used, nsid);
/* Call all termination functions at once. */
#ifdef SHARED

5
elf/dl-fini.c
View File

@ -30,8 +30,7 @@ typedef void (*fini_t) (void);
void
internal_function
_dl_sort_fini (struct link_map *l, struct link_map **maps, size_t nmaps,
char *used, Lmid_t ns)
_dl_sort_fini (struct link_map **maps, size_t nmaps, char *used, Lmid_t ns)
{
/* A list of one element need not be sorted. */
if (nmaps == 1)
@ -199,7 +198,7 @@ _dl_fini (void)
nmaps = i;
/* Now we have to do the sorting. */
_dl_sort_fini (GL(dl_ns)[ns]._ns_loaded, maps, nmaps, NULL, ns);
_dl_sort_fini (maps, nmaps, NULL, ns);
/* We do not rely on the linked list of loaded object anymore from
this point on. We have our own list here (maps). The various

6
sysdeps/generic/ldsodefs.h
View File

@ -1,5 +1,5 @@
/* Run-time dynamic linker data structures for loaded ELF shared objects.
Copyright (C) 1995-2009, 2010 Free Software Foundation, Inc.
Copyright (C) 1995-2009, 2010, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -947,8 +947,8 @@ extern void _dl_init (struct link_map *main_map, int argc, char **argv,
extern void _dl_fini (void) internal_function;
/* Sort array MAPS according to dependencies of the contained objects. */
extern void _dl_sort_fini (struct link_map *l, struct link_map **maps,
size_t nmaps, char *used, Lmid_t ns)
extern void _dl_sort_fini (struct link_map **maps, size_t nmaps, char *used,
Lmid_t ns)
internal_function;
/* The dynamic linker calls this function before and having changing