[binutils-gdb] ld/plugins: avoid shadowing a C library symbol

[Jan Beulich <jbeulich at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=8e5cb9a54e156ba24a439aefa7b35e53b4cb0374

commit 8e5cb9a54e156ba24a439aefa7b35e53b4cb0374
Author: Jan Beulich <jbeulich@novell.com>
Date:   Tue Jun 25 12:02:23 2019 +0200

    ld/plugins: avoid shadowing a C library symbol
    
    With my (oldish) gcc/glibc combination I'm seeing
    
    .../ld/plugin.c: In function Â?get_lto_kindÂ?:
    .../ld/plugin.c:664: error: declaration of Â?indexÂ? shadows a global declaration
    /usr/include/string.h:487: error: shadowed declaration is here
    .../ld/plugin.c: In function Â?get_lto_resolutionÂ?:
    .../ld/plugin.c:685: error: declaration of Â?indexÂ? shadows a global declaration
    /usr/include/string.h:487: error: shadowed declaration is here
    .../ld/plugin.c: In function Â?get_lto_visibilityÂ?:
    .../ld/plugin.c:711: error: declaration of Â?indexÂ? shadows a global declaration
    /usr/include/string.h:487: error: shadowed declaration is here

Diff:
---
 ld/ChangeLog |  5 +++++
 ld/plugin.c  | 30 +++++++++++++++---------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 2c11a66..cb9ae84 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2019-06-25  Jan Beulich  <jbeulich@suse.com>
+
+	* plugin.c (get_lto_kind, get_lto_resolution,
+	get_lto_visibility): Rename "index" to "idx".
+
 2019-06-24  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR ld/24721
diff --git a/ld/plugin.c b/ld/plugin.c
index fcd864a..0344da2 100644
--- a/ld/plugin.c
+++ b/ld/plugin.c
@@ -659,9 +659,9 @@ is_visible_from_outside (struct ld_plugin_symbol *lsym,
   return FALSE;
 }
 
-/* Return LTO kind string name that corresponds to INDEX enum value.  */
+/* Return LTO kind string name that corresponds to IDX enum value.  */
 static const char *
-get_lto_kind (unsigned int index)
+get_lto_kind (unsigned int idx)
 {
   static char buffer[64];
   const char *lto_kind_str[5] =
@@ -673,16 +673,16 @@ get_lto_kind (unsigned int index)
     "COMMON"
   };
 
-  if (index < ARRAY_SIZE (lto_kind_str))
-    return lto_kind_str [index];
+  if (idx < ARRAY_SIZE (lto_kind_str))
+    return lto_kind_str [idx];
 
-  sprintf (buffer, _("unknown LTO kind value %x"), index);
+  sprintf (buffer, _("unknown LTO kind value %x"), idx);
   return buffer;
 }
 
-/* Return LTO resolution string name that corresponds to INDEX enum value.  */
+/* Return LTO resolution string name that corresponds to IDX enum value.  */
 static const char *
-get_lto_resolution (unsigned int index)
+get_lto_resolution (unsigned int idx)
 {
   static char buffer[64];
   static const char *lto_resolution_str[10] =
@@ -699,16 +699,16 @@ get_lto_resolution (unsigned int index)
     "PREVAILING_DEF_IRONLY_EXP",
   };
 
-  if (index < ARRAY_SIZE (lto_resolution_str))
-    return lto_resolution_str [index];
+  if (idx < ARRAY_SIZE (lto_resolution_str))
+    return lto_resolution_str [idx];
 
-  sprintf (buffer, _("unknown LTO resolution value %x"), index);
+  sprintf (buffer, _("unknown LTO resolution value %x"), idx);
   return buffer;
 }
 
-/* Return LTO visibility string name that corresponds to INDEX enum value.  */
+/* Return LTO visibility string name that corresponds to IDX enum value.  */
 static const char *
-get_lto_visibility (unsigned int index)
+get_lto_visibility (unsigned int idx)
 {
   static char buffer[64];
   const char *lto_visibility_str[4] =
@@ -719,10 +719,10 @@ get_lto_visibility (unsigned int index)
     "HIDDEN"
   };
 
-  if (index < ARRAY_SIZE (lto_visibility_str))
-    return lto_visibility_str [index];
+  if (idx < ARRAY_SIZE (lto_visibility_str))
+    return lto_visibility_str [idx];
 
-  sprintf (buffer, _("unknown LTO visibility value %x"), index);
+  sprintf (buffer, _("unknown LTO visibility value %x"), idx);
   return buffer;
 }