[PATCH] elf/dl-lookup.c: Remove unused variable

Marek Polacek mpolacek@redhat.com
Tue Jun 28 18:33:00 GMT 2011


On 06/28/2011 06:57 PM, Jakub Jelinek wrote:
> This looks wrong, it changes the behavior.  If nchain isnt used here,

Yeah, it is wrong, thanks for noticing.  I've realized this mistake
just on the way from office...  I'm sorry.  Here's a correct version.

2011-06-28  Marek Polacek  <mpolacek@redhat.com>

	* elf/dl-lookup.c (_dl_setup_hash): Remove unused variable.

--- libc/elf/dl-lookup.c.mp     2011-06-28 17:21:09.409592032 +0200
+++ libc/elf/dl-lookup.c        2011-06-28 20:15:10.315574331 +0200
@@ -860,7 +860,6 @@ internal_function
 _dl_setup_hash (struct link_map *map)
 {
   Elf_Symndx *hash;
-  Elf_Symndx nchain;
 
   if (__builtin_expect (map->l_info[DT_ADDRTAGIDX (DT_GNU_HASH) + DT_NUM
                                    + DT_THISPROCNUM + DT_VERSIONTAGNUM
@@ -892,8 +891,7 @@ _dl_setup_hash (struct link_map *map)
   hash = (void *) D_PTR (map, l_info[DT_HASH]);
 
   map->l_nbuckets = *hash++;
-  nchain = *hash++;
-  map->l_buckets = hash;
+  map->l_buckets = ++hash;
   hash += map->l_nbuckets;
   map->l_chain = hash;
 }



More information about the Libc-alpha mailing list