From: Jan Beulich <jbeulich@suse.com>
Date: Wed, 4 May 2022 06:36:14 +0000 (+0200)
Subject: Dwarf: rename yet another instance of "index"
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3569f4ab7e4bb8bf34db35b623da0c5774b4ee90;p=binutils-gdb.git

Dwarf: rename yet another instance of "index"

As before, on sufficiently old glibc this conflicts with a global
identifier in the library headers. While there also zap the unusual
padding by blanks.
---

diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index bc862f77c04..e61c63a0601 100644
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -825,8 +825,8 @@ fetch_indexed_addr (dwarf_vma offset, uint32_t num_bytes)
    Returns 0 if the value could not be found.  */
 
 static dwarf_vma
-fetch_indexed_value (dwarf_vma                        index,
-		     enum dwarf_section_display_enum  sec_enum)
+fetch_indexed_value (dwarf_vma idx,
+		     enum dwarf_section_display_enum sec_enum)
 {
   struct dwarf_section *section = &debug_displays [sec_enum].section;
 
@@ -849,7 +849,7 @@ fetch_indexed_value (dwarf_vma                        index,
       bias = 12;
     }
  
-  dwarf_vma offset = index * pointer_size;
+  dwarf_vma offset = idx * pointer_size;
 
   /* Offsets are biased by the size of the section header.  */
   offset += bias;