Add -Wshadow to the gcc command line options used when compiling the binutils.

Fix up all warnings generated by the addition of this switch.

1 files changed, 53 insertions, 53 deletions

diff --git a/bfd/xsym.c b/bfd/xsym.c
index dd1ffd7..6d56729 100644
--- a/bfd/xsym.c
+++ b/bfd/xsym.c
@@ -84,11 +84,11 @@ static unsigned long
 compute_offset (unsigned long first_page,
 		unsigned long page_size,
 		unsigned long entry_size,
-		unsigned long index)
+		unsigned long sym_index)
 {
   unsigned long entries_per_page = page_size / entry_size;
-  unsigned long page_number = first_page + (index / entries_per_page);
-  unsigned long page_offset = (index % entries_per_page) * entry_size;
+  unsigned long page_number = first_page + (sym_index / entries_per_page);
+  unsigned long page_offset = (sym_index % entries_per_page) * entry_size;
 
   return (page_number * page_size) + page_offset;
 }
@@ -530,7 +530,7 @@ bfd_sym_parse_type_table_entry_v32 (unsigned char *buf,
 int
 bfd_sym_fetch_resources_table_entry (bfd *abfd,
 				     bfd_sym_resources_table_entry *entry,
-				     unsigned long index)
+				     unsigned long sym_index)
 {
   void (*parser) (unsigned char *, size_t, bfd_sym_resources_table_entry *);
   unsigned long offset;
@@ -542,7 +542,7 @@ bfd_sym_fetch_resources_table_entry (bfd *abfd,
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
 
-  if (index == 0)
+  if (sym_index == 0)
     return -1;
 
   switch (sdata->version)
@@ -566,7 +566,7 @@ bfd_sym_fetch_resources_table_entry (bfd *abfd,
 
   offset = compute_offset (sdata->header.dshb_rte.dti_first_page,
 			   sdata->header.dshb_page_size,
-			   entry_size, index);
+			   entry_size, sym_index);
 
   if (bfd_seek (abfd, offset, SEEK_SET) < 0)
     return -1;
@@ -581,7 +581,7 @@ bfd_sym_fetch_resources_table_entry (bfd *abfd,
 int
 bfd_sym_fetch_modules_table_entry (bfd *abfd,
 				   bfd_sym_modules_table_entry *entry,
-				   unsigned long index)
+				   unsigned long sym_index)
 {
   void (*parser) (unsigned char *, size_t, bfd_sym_modules_table_entry *);
   unsigned long offset;
@@ -593,7 +593,7 @@ bfd_sym_fetch_modules_table_entry (bfd *abfd,
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
 
-  if (index == 0)
+  if (sym_index == 0)
     return -1;
 
   switch (sdata->version)
@@ -617,7 +617,7 @@ bfd_sym_fetch_modules_table_entry (bfd *abfd,
 
   offset = compute_offset (sdata->header.dshb_mte.dti_first_page,
 			   sdata->header.dshb_page_size,
-			   entry_size, index);
+			   entry_size, sym_index);
 
   if (bfd_seek (abfd, offset, SEEK_SET) < 0)
     return -1;
@@ -632,7 +632,7 @@ bfd_sym_fetch_modules_table_entry (bfd *abfd,
 int
 bfd_sym_fetch_file_references_table_entry (bfd *abfd,
 					   bfd_sym_file_references_table_entry *entry,
-					   unsigned long index)
+					   unsigned long sym_index)
 {
   void (*parser) (unsigned char *, size_t, bfd_sym_file_references_table_entry *);
   unsigned long offset;
@@ -644,7 +644,7 @@ bfd_sym_fetch_file_references_table_entry (bfd *abfd,
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
 
-  if (index == 0)
+  if (sym_index == 0)
     return -1;
 
   switch (sdata->version)
@@ -667,7 +667,7 @@ bfd_sym_fetch_file_references_table_entry (bfd *abfd,
 
   offset = compute_offset (sdata->header.dshb_frte.dti_first_page,
 			   sdata->header.dshb_page_size,
-			   entry_size, index);
+			   entry_size, sym_index);
 
   if (bfd_seek (abfd, offset, SEEK_SET) < 0)
     return -1;
@@ -682,7 +682,7 @@ bfd_sym_fetch_file_references_table_entry (bfd *abfd,
 int
 bfd_sym_fetch_contained_modules_table_entry (bfd *abfd,
 					     bfd_sym_contained_modules_table_entry *entry,
-					     unsigned long index)
+					     unsigned long sym_index)
 {
   void (*parser) (unsigned char *, size_t, bfd_sym_contained_modules_table_entry *);
   unsigned long offset;
@@ -694,7 +694,7 @@ bfd_sym_fetch_contained_modules_table_entry (bfd *abfd,
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
 
-  if (index == 0)
+  if (sym_index == 0)
     return -1;
 
   switch (sdata->version)
@@ -717,7 +717,7 @@ bfd_sym_fetch_contained_modules_table_entry (bfd *abfd,
 
   offset = compute_offset (sdata->header.dshb_cmte.dti_first_page,
 			   sdata->header.dshb_page_size,
-			   entry_size, index);
+			   entry_size, sym_index);
 
   if (bfd_seek (abfd, offset, SEEK_SET) < 0)
     return -1;
@@ -732,7 +732,7 @@ bfd_sym_fetch_contained_modules_table_entry (bfd *abfd,
 int
 bfd_sym_fetch_contained_variables_table_entry (bfd *abfd,
 					       bfd_sym_contained_variables_table_entry *entry,
-					       unsigned long index)
+					       unsigned long sym_index)
 {
   void (*parser) (unsigned char *, size_t, bfd_sym_contained_variables_table_entry *);
   unsigned long offset;
@@ -744,7 +744,7 @@ bfd_sym_fetch_contained_variables_table_entry (bfd *abfd,
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
 
-  if (index == 0)
+  if (sym_index == 0)
     return -1;
 
   switch (sdata->version)
@@ -767,7 +767,7 @@ bfd_sym_fetch_contained_variables_table_entry (bfd *abfd,
 
   offset = compute_offset (sdata->header.dshb_cvte.dti_first_page,
 			   sdata->header.dshb_page_size,
-			   entry_size, index);
+			   entry_size, sym_index);
 
   if (bfd_seek (abfd, offset, SEEK_SET) < 0)
     return -1;
@@ -782,7 +782,7 @@ bfd_sym_fetch_contained_variables_table_entry (bfd *abfd,
 int
 bfd_sym_fetch_contained_statements_table_entry (bfd *abfd,
 						bfd_sym_contained_statements_table_entry *entry,
-						unsigned long index)
+						unsigned long sym_index)
 {
   void (*parser) (unsigned char *, size_t, bfd_sym_contained_statements_table_entry *);
   unsigned long offset;
@@ -794,7 +794,7 @@ bfd_sym_fetch_contained_statements_table_entry (bfd *abfd,
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
 
-  if (index == 0)
+  if (sym_index == 0)
     return -1;
 
   switch (sdata->version)
@@ -817,7 +817,7 @@ bfd_sym_fetch_contained_statements_table_entry (bfd *abfd,
 
   offset = compute_offset (sdata->header.dshb_csnte.dti_first_page,
 			   sdata->header.dshb_page_size,
-			   entry_size, index);
+			   entry_size, sym_index);
 
   if (bfd_seek (abfd, offset, SEEK_SET) < 0)
     return -1;
@@ -832,7 +832,7 @@ bfd_sym_fetch_contained_statements_table_entry (bfd *abfd,
 int
 bfd_sym_fetch_contained_labels_table_entry (bfd *abfd,
 					    bfd_sym_contained_labels_table_entry *entry,
-					    unsigned long index)
+					    unsigned long sym_index)
 {
   void (*parser) (unsigned char *, size_t, bfd_sym_contained_labels_table_entry *);
   unsigned long offset;
@@ -844,7 +844,7 @@ bfd_sym_fetch_contained_labels_table_entry (bfd *abfd,
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
 
-  if (index == 0)
+  if (sym_index == 0)
     return -1;
 
   switch (sdata->version)
@@ -867,7 +867,7 @@ bfd_sym_fetch_contained_labels_table_entry (bfd *abfd,
 
   offset = compute_offset (sdata->header.dshb_clte.dti_first_page,
 			   sdata->header.dshb_page_size,
-			   entry_size, index);
+			   entry_size, sym_index);
 
   if (bfd_seek (abfd, offset, SEEK_SET) < 0)
     return -1;
@@ -882,7 +882,7 @@ bfd_sym_fetch_contained_labels_table_entry (bfd *abfd,
 int
 bfd_sym_fetch_contained_types_table_entry (bfd *abfd,
 					   bfd_sym_contained_types_table_entry *entry,
-					   unsigned long index)
+					   unsigned long sym_index)
 {
   void (*parser) (unsigned char *, size_t, bfd_sym_contained_types_table_entry *);
   unsigned long offset;
@@ -894,7 +894,7 @@ bfd_sym_fetch_contained_types_table_entry (bfd *abfd,
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
 
-  if (index == 0)
+  if (sym_index == 0)
     return -1;
 
   switch (sdata->version)
@@ -917,7 +917,7 @@ bfd_sym_fetch_contained_types_table_entry (bfd *abfd,
 
   offset = compute_offset (sdata->header.dshb_ctte.dti_first_page,
 			   sdata->header.dshb_page_size,
-			   entry_size, index);
+			   entry_size, sym_index);
 
   if (bfd_seek (abfd, offset, SEEK_SET) < 0)
     return -1;
@@ -932,7 +932,7 @@ bfd_sym_fetch_contained_types_table_entry (bfd *abfd,
 int
 bfd_sym_fetch_file_references_index_table_entry (bfd *abfd,
 						 bfd_sym_file_references_index_table_entry *entry,
-						 unsigned long index)
+						 unsigned long sym_index)
 {
   void (*parser) (unsigned char *, size_t, bfd_sym_file_references_index_table_entry *);
   unsigned long offset;
@@ -944,7 +944,7 @@ bfd_sym_fetch_file_references_index_table_entry (bfd *abfd,
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
 
-  if (index == 0)
+  if (sym_index == 0)
     return -1;
 
   switch (sdata->version)
@@ -967,7 +967,7 @@ bfd_sym_fetch_file_references_index_table_entry (bfd *abfd,
 
   offset = compute_offset (sdata->header.dshb_fite.dti_first_page,
 			   sdata->header.dshb_page_size,
-			   entry_size, index);
+			   entry_size, sym_index);
 
   if (bfd_seek (abfd, offset, SEEK_SET) < 0)
     return -1;
@@ -982,7 +982,7 @@ bfd_sym_fetch_file_references_index_table_entry (bfd *abfd,
 int
 bfd_sym_fetch_constant_pool_entry (bfd *abfd,
 				   bfd_sym_constant_pool_entry *entry,
-				   unsigned long index)
+				   unsigned long sym_index)
 {
   void (*parser) (unsigned char *, size_t, bfd_sym_constant_pool_entry *);
   unsigned long offset;
@@ -994,7 +994,7 @@ bfd_sym_fetch_constant_pool_entry (bfd *abfd,
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
 
-  if (index == 0)
+  if (sym_index == 0)
     return -1;
 
   switch (sdata->version)
@@ -1017,7 +1017,7 @@ bfd_sym_fetch_constant_pool_entry (bfd *abfd,
 
   offset = compute_offset (sdata->header.dshb_fite.dti_first_page,
 			   sdata->header.dshb_page_size,
-			   entry_size, index);
+			   entry_size, sym_index);
 
   if (bfd_seek (abfd, offset, SEEK_SET) < 0)
     return -1;
@@ -1032,7 +1032,7 @@ bfd_sym_fetch_constant_pool_entry (bfd *abfd,
 int
 bfd_sym_fetch_type_table_entry (bfd *abfd,
 				bfd_sym_type_table_entry *entry,
-				unsigned long index)
+				unsigned long sym_index)
 {
   void (*parser) (unsigned char *, size_t, bfd_sym_type_table_entry *);
   unsigned long offset;
@@ -1064,7 +1064,7 @@ bfd_sym_fetch_type_table_entry (bfd *abfd,
 
   offset = compute_offset (sdata->header.dshb_tte.dti_first_page,
 			   sdata->header.dshb_page_size,
-			   entry_size, index);
+			   entry_size, sym_index);
 
   if (bfd_seek (abfd, offset, SEEK_SET) < 0)
     return -1;
@@ -1124,7 +1124,7 @@ bfd_sym_fetch_type_information_table_entry (bfd *abfd,
 int
 bfd_sym_fetch_type_table_information (bfd *abfd,
 				      bfd_sym_type_information_table_entry *entry,
-				      unsigned long index)
+				      unsigned long sym_index)
 {
   bfd_sym_type_table_entry tindex;
   bfd_sym_data_struct *sdata = NULL;
@@ -1134,10 +1134,10 @@ bfd_sym_fetch_type_table_information (bfd *abfd,
 
   if (sdata->header.dshb_tte.dti_object_count <= 99)
     return -1;
-  if (index < 100)
+  if (sym_index < 100)
     return -1;
 
-  if (bfd_sym_fetch_type_table_entry (abfd, &tindex, index - 100) < 0)
+  if (bfd_sym_fetch_type_table_entry (abfd, &tindex, sym_index - 100) < 0)
     return -1;
   if (bfd_sym_fetch_type_information_table_entry (abfd, entry, tindex) < 0)
     return -1;
@@ -1146,30 +1146,30 @@ bfd_sym_fetch_type_table_information (bfd *abfd,
 }
 
 const unsigned char *
-bfd_sym_symbol_name (bfd *abfd, unsigned long index)
+bfd_sym_symbol_name (bfd *abfd, unsigned long sym_index)
 {
   bfd_sym_data_struct *sdata = NULL;
 
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
 
-  if (index == 0)
+  if (sym_index == 0)
     return (const unsigned char *) "";
 
-  index *= 2;
-  if ((index / sdata->header.dshb_page_size)
+  sym_index *= 2;
+  if ((sym_index / sdata->header.dshb_page_size)
       > sdata->header.dshb_nte.dti_page_count)
     return (const unsigned char *) "\09[INVALID]";
 
-  return (const unsigned char *) sdata->name_table + index;
+  return (const unsigned char *) sdata->name_table + sym_index;
 }
 
 const unsigned char *
-bfd_sym_module_name (bfd *abfd, unsigned long index)
+bfd_sym_module_name (bfd *abfd, unsigned long sym_index)
 {
   bfd_sym_modules_table_entry entry;
 
-  if (bfd_sym_fetch_modules_table_entry (abfd, &entry, index) < 0)
+  if (bfd_sym_fetch_modules_table_entry (abfd, &entry, sym_index) < 0)
     return (const unsigned char *) "\09[INVALID]";
 
   return bfd_sym_symbol_name (abfd, entry.mte_nte_index);
@@ -1859,24 +1859,24 @@ bfd_sym_display_name_table_entry (bfd *abfd,
 				  FILE *f,
 				  unsigned char *entry)
 {
-  unsigned long index;
+  unsigned long sym_index;
   unsigned long offset;
   bfd_sym_data_struct *sdata = NULL;
 
   BFD_ASSERT (bfd_sym_valid (abfd));
   sdata = abfd->tdata.sym_data;
-  index = (entry - sdata->name_table) / 2;
+  sym_index = (entry - sdata->name_table) / 2;
 
   if (sdata->version >= BFD_SYM_VERSION_3_4 && entry[0] == 255 && entry[1] == 0)
     {
       unsigned short length = bfd_getb16 (entry + 2);
-      fprintf (f, "[%8lu] \"%.*s\"\n", index, length, entry + 4);
+      fprintf (f, "[%8lu] \"%.*s\"\n", sym_index, length, entry + 4);
       offset = 2 + length + 1;
     }
   else
     {
       if (! (entry[0] == 0 || (entry[0] == 1 && entry[1] == '\0')))
-	fprintf (f, "[%8lu] \"%.*s\"\n", index, entry[0], entry + 1);
+	fprintf (f, "[%8lu] \"%.*s\"\n", sym_index, entry[0], entry + 1);
 
       if (sdata->version >= BFD_SYM_VERSION_3_4)
 	offset = entry[0] + 2;
@@ -2178,7 +2178,7 @@ void
 bfd_sym_display_type_information_table (bfd *abfd, FILE *f)
 {
   unsigned long i;
-  bfd_sym_type_table_entry index;
+  bfd_sym_type_table_entry sym_index;
   bfd_sym_type_information_table_entry entry;
   bfd_sym_data_struct *sdata = NULL;
 
@@ -2196,13 +2196,13 @@ bfd_sym_display_type_information_table (bfd *abfd, FILE *f)
 
   for (i = 100; i <= sdata->header.dshb_tte.dti_object_count; i++)
     {
-      if (bfd_sym_fetch_type_table_entry (abfd, &index, i - 100) < 0)
+      if (bfd_sym_fetch_type_table_entry (abfd, &sym_index, i - 100) < 0)
 	fprintf (f, " [%8lu] [INVALID]\n", i);
       else
 	{
-	  fprintf (f, " [%8lu] (TINFO %lu) ", i, index);
+	  fprintf (f, " [%8lu] (TINFO %lu) ", i, sym_index);
 
-	  if (bfd_sym_fetch_type_information_table_entry (abfd, &entry, index) < 0)
+	  if (bfd_sym_fetch_type_information_table_entry (abfd, &entry, sym_index) < 0)
 	    fprintf (f, "[INVALID]");
 	  else
 	    bfd_sym_print_type_information_table_entry (abfd, f, &entry);