From patchwork Mon Oct 6 19:49:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kostya Serebryany X-Patchwork-Id: 3116 Received: (qmail 23169 invoked by alias); 6 Oct 2014 19:49:49 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 23158 invoked by uid 89); 6 Oct 2014 19:49:48 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-vc0-f177.google.com X-Received: by 10.52.179.161 with SMTP id dh1mr2027942vdc.78.1412624985448; Mon, 06 Oct 2014 12:49:45 -0700 (PDT) MIME-Version: 1.0 From: Konstantin Serebryany Date: Mon, 6 Oct 2014 12:49:25 -0700 Message-ID: Subject: [PATCH] remove nested functions from elf/dl-lookup.c To: Roland McGrath , GNU C Library Hi, Please review the patch that removes a nested function from elf/dl-lookup.c. This just moves a nested function outside -- no change in parameters. No regressions in 'make check' on x86_64-linux-gnu (Ubuntu 14.04) 2014-10-06 Kostya Serebryany * elf/dl-lookup.c (enter): New function broken out do_lookup_unique. (do_lookup_unique): Remove that nested function. diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c index 7c32830..5d3c384 100644 --- a/elf/dl-lookup.c +++ b/elf/dl-lookup.c @@ -182,6 +182,30 @@ check_match (const char *const undef_name, return sym; } +/* We have to determine whether we already found a + symbol with this name before. If not then we have to + add it to the search table. If we already found a + definition we have to use it. */ +static void +enter (struct unique_sym *table, size_t size, + unsigned int hash, const char *name, + const ElfW(Sym) *sym, const struct link_map *map) +{ + size_t idx = hash % size; + size_t hash2 = 1 + hash % (size - 2); + while (table[idx].name != NULL) + { + idx += hash2; + if (idx >= size) + idx -= size; + } + + table[idx].hashval = hash; + table[idx].name = name; + table[idx].sym = sym; + table[idx].map = map; +} + /* Utility function for do_lookup_x. Lookup an STB_GNU_UNIQUE symbol in the unique symbol table, creating a new entry if necessary. Return the matching symbol in RESULT. */ @@ -191,29 +215,6 @@ do_lookup_unique (const char *undef_name, uint_fast32_t new_hash, int type_class, const ElfW(Sym) *sym, const char *strtab, const ElfW(Sym) *ref, const struct link_map *undef_map) { - /* We have to determine whether we already found a - symbol with this name before. If not then we have to - add it to the search table. If we already found a - definition we have to use it. */ - void enter (struct unique_sym *table, size_t size, - unsigned int hash, const char *name, - const ElfW(Sym) *sym, const struct link_map *map) - { - size_t idx = hash % size; - size_t hash2 = 1 + hash % (size - 2); - while (table[idx].name != NULL) - { - idx += hash2; - if (idx >= size) - idx -= size; - } - - table[idx].hashval = hash; - table[idx].name = name; - table[idx].sym = sym; - table[idx].map = map; - } - struct unique_sym_table *tab = &GL(dl_ns)[map->l_ns]._ns_unique_sym_table;