From f6488e2b7f13529cde762d02a0352071c078ff9a Mon Sep 17 00:00:00 2001 From: Will Newton Date: Wed, 2 Apr 2014 15:23:16 +0100 Subject: [PATCH] elf/dl-lookup.c: Remove obsolete comment about nested function The nested function referred to has gone away so remove the comment. Also move the variable declaration down to where other variables of a similar lifetime are declared for clarity. 2014-04-03 Will Newton * elf/dl-lookup.c (do_lookup_x): Remove comment referring to nested function and move variable declarations down to before first use. --- ChangeLog | 6 ++++++ elf/dl-lookup.c | 9 ++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7e530ef40d..e36b689d29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-04-03 Will Newton + + * elf/dl-lookup.c (do_lookup_x): Remove comment + referring to nested function and move variable + declarations down to before first use. + 2014-04-02 Joseph Myers [BZ #16799] diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c index d1b8efc5d7..be6f76faa8 100644 --- a/elf/dl-lookup.c +++ b/elf/dl-lookup.c @@ -208,11 +208,6 @@ do_lookup_x (const char *undef_name, uint_fast32_t new_hash, do { - /* These variables are used in the nested function. */ - Elf_Symndx symidx; - int num_versions = 0; - const ElfW(Sym) *versioned_sym = NULL; - const struct link_map *map = list[i]->l_real; /* Here come the extra test needed for `_dl_lookup_symbol_skip'. */ @@ -237,6 +232,10 @@ do_lookup_x (const char *undef_name, uint_fast32_t new_hash, if (map->l_nbuckets == 0) continue; + Elf_Symndx symidx; + int num_versions = 0; + const ElfW(Sym) *versioned_sym = NULL; + /* The tables for this map. */ const ElfW(Sym) *symtab = (const void *) D_PTR (map, l_info[DT_SYMTAB]); const char *strtab = (const void *) D_PTR (map, l_info[DT_STRTAB]); -- 2.11.4.GIT