This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] _dl_sort_fini: Remove unused argument
- From: Marek Polacek <mpolacek at redhat dot com>
- To: libc-alpha <libc-alpha at sourceware dot org>
- Date: Thu, 14 Jul 2011 22:23:36 +0200
- Subject: [PATCH] _dl_sort_fini: Remove unused argument
As the subject says.
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.
--- libc/elf/dl-fini.c.mp 2011-07-14 21:49:59.471669429 +0200
+++ libc/elf/dl-fini.c 2011-07-14 21:51:30.668797531 +0200
@@ -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
--- libc/elf/dl-close.c.mp 2011-07-14 21:52:25.340671723 +0200
+++ libc/elf/dl-close.c 2011-07-14 21:52:39.365698751 +0200
@@ -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
--- libc/sysdeps/generic/ldsodefs.h.mp 2011-07-14 21:53:32.069672034 +0200
+++ libc/sysdeps/generic/ldsodefs.h 2011-07-14 22:05:30.305794742 +0200
@@ -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 *m
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