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, 6 insertions, 6 deletions

diff --git a/binutils/bucomm.c b/binutils/bucomm.c
index 64653d65a1..e568b031ab 100644
--- a/binutils/bucomm.c
+++ b/binutils/bucomm.c
@@ -70,12 +70,12 @@ bfd_nonfatal (const char *string)
    PROGRAM:file: bfd-error-message
    PROGRAM:file[section]: bfd-error-message
    PROGRAM:file: printf-message: bfd-error-message
-   PROGRAM:file[section]: printf-message: bfd-error-message
-*/
+   PROGRAM:file[section]: printf-message: bfd-error-message.  */
 
 void
 bfd_nonfatal_message (const char *filename,
-		      const bfd *bfd, const asection *section,
+		      const bfd *abfd,
+		      const asection *section,
 		      const char *format, ...)
 {
   const char *errmsg = bfd_errmsg (bfd_get_error ());
@@ -85,12 +85,12 @@ bfd_nonfatal_message (const char *filename,
   va_start (args, format);
   fprintf (stderr, "%s", program_name);
   
-  if (bfd)
+  if (abfd)
     {
       if (!filename)
-	filename = bfd_get_archive_filename (bfd);
+	filename = bfd_get_archive_filename (abfd);
       if (section)
-	section_name = bfd_get_section_name (bfd, section);
+	section_name = bfd_get_section_name (abfd, section);
     }
   if (section_name)
     fprintf (stderr, ":%s[%s]", filename, section_name);