Rename function arguments to avoid shadowing global symbols of the same name.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 5da8eb5..064883a 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,12 @@
+2002-07-31  Nick Clifton  <nickc@redhat.com>
+
+       * bfd.c (bfd_alt_mach_code): Rename parameter 'index' to
+       'alternative' in order to avoid shadowing global symbol of the
+       same name.
+       * bfd-in2.h: Regenerate.
+       * libbfd.h: Regenerate.
+       * libcoff.h: Regenerate.
+

 2002-07-31  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
 
        * Makefile.am: Add n32 ABI support.
 2002-07-31  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
 
        * Makefile.am: Add n32 ABI support.

diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 401b027..da3307d 100644 (file)
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -1,7 +1,6 @@
 /* DO NOT EDIT!  -*- buffer-read-only: t -*-  This file is automatically 
 /* DO NOT EDIT!  -*- buffer-read-only: t -*-  This file is automatically 

-   generated from "bfd-in.h", "init.c", "opncls.c", "libbfd.c", 
-   "section.c", "archures.c", "reloc.c", "syms.c", "bfd.c", "archive.c", 
-   "corefile.c", "targets.c" and "format.c".
+   generated from "bfd-in.h", "init.c", "opncls.c", "libbfd.c" and 
+   "section.c".

    Run "make headers" in your build bfd/ to regenerate.  */
 
 /* Main header file for the bfd library -- portable access to object files.
    Run "make headers" in your build bfd/ to regenerate.  */
 
 /* Main header file for the bfd library -- portable access to object files.


@@ -3663,7 +3662,7 @@ extern bfd_byte *bfd_get_relocated_section_contents
                  boolean, asymbol **));
 
 boolean
                  boolean, asymbol **));
 
 boolean

-bfd_alt_mach_code PARAMS ((bfd *abfd, int index));
+bfd_alt_mach_code PARAMS ((bfd *abfd, int alternative));

 
 /* Extracted from archive.c.  */
 symindex
 
 /* Extracted from archive.c.  */
 symindex

diff --git a/bfd/bfd.c b/bfd/bfd.c
index d230aac..277c74a 100644 (file)
--- a/bfd/bfd.c
+++ b/bfd/bfd.c
@@ -1334,27 +1334,27 @@ FUNCTION
        bfd_alt_mach_code
 
 SYNOPSIS
        bfd_alt_mach_code
 
 SYNOPSIS

-       boolean bfd_alt_mach_code(bfd *abfd, int index);
+       boolean bfd_alt_mach_code(bfd *abfd, int alternative);

 
 DESCRIPTION
 
        When more than one machine code number is available for the
        same machine type, this function can be used to switch between
 
 DESCRIPTION
 
        When more than one machine code number is available for the
        same machine type, this function can be used to switch between

-       the preferred one (index == 0) and any others.  Currently,
+       the preferred one (alternative == 0) and any others.  Currently,

        only ELF supports this feature, with up to two alternate
        machine codes.
 */
 
 boolean
        only ELF supports this feature, with up to two alternate
        machine codes.
 */
 
 boolean

-bfd_alt_mach_code (abfd, index)
+bfd_alt_mach_code (abfd, alternative)

      bfd *abfd;
      bfd *abfd;

-     int index;
+     int alternative;

 {
   if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
     {
       int code;
 
 {
   if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
     {
       int code;
 

-      switch (index)
+      switch (alternative)

        {
        case 0:
          code = get_elf_backend_data (abfd)->elf_machine_code;
        {
        case 0:
          code = get_elf_backend_data (abfd)->elf_machine_code;

diff --git a/bfd/libbfd.h b/bfd/libbfd.h
index f7c8cc1..ae1e753 100644 (file)
--- a/bfd/libbfd.h
+++ b/bfd/libbfd.h
@@ -1,6 +1,5 @@
 /* DO NOT EDIT!  -*- buffer-read-only: t -*-  This file is automatically 
 /* DO NOT EDIT!  -*- buffer-read-only: t -*-  This file is automatically 

-   generated from "libbfd-in.h", "init.c", "libbfd.c", "cache.c", 
-   "reloc.c", "archures.c" and "elf.c".
+   generated from "proto.str                   chew".

    Run "make headers" in your build bfd/ to regenerate.  */
 
 /* libbfd.h -- Declarations used by bfd library *implementation*.
    Run "make headers" in your build bfd/ to regenerate.  */
 
 /* libbfd.h -- Declarations used by bfd library *implementation*.

diff --git a/bfd/libcoff.h b/bfd/libcoff.h
index 88b0909..e2f6786 100644 (file)
--- a/bfd/libcoff.h
+++ b/bfd/libcoff.h
@@ -1,5 +1,5 @@
 /* DO NOT EDIT!  -*- buffer-read-only: t -*-  This file is automatically 
 /* DO NOT EDIT!  -*- buffer-read-only: t -*-  This file is automatically 

-   generated from "libcoff-in.h" and "coffcode.h".
+   generated from "proto.str                   chew".

    Run "make headers" in your build bfd/ to regenerate.  */
 
 /* BFD COFF object file private structure.
    Run "make headers" in your build bfd/ to regenerate.  */
 
 /* BFD COFF object file private structure.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 7362803..239f327 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,10 @@
+2002-07-31  Nick Clifton  <nickc@redhat.com>
+
+       * addr2line.c (process_file): Rename parameter 'filename' to
+       'file_name' in order to avoid shadowing global symbol of the
+       same name.
+       (main): Likewise.
+

 2002-07-30  Jakub Jelinek  <jakub@redhat.com>
 
        * readelf.c (OPTION_DEBUG_DUMP): Define.
 2002-07-30  Jakub Jelinek  <jakub@redhat.com>
 
        * readelf.c (OPTION_DEBUG_DUMP): Define.

diff --git a/binutils/addr2line.c b/binutils/addr2line.c
index 2d9dc90..174a034 100644 (file)
--- a/binutils/addr2line.c
+++ b/binutils/addr2line.c
@@ -233,19 +233,19 @@ translate_addresses (abfd)
 /* Process a file.  */
 
 static void
 /* Process a file.  */
 
 static void

-process_file (filename, target)
-     const char *filename;
+process_file (file_name, target)
+     const char *file_name;

      const char *target;
 {
   bfd *abfd;
   char **matching;
 
      const char *target;
 {
   bfd *abfd;
   char **matching;
 

-  abfd = bfd_openr (filename, target);
+  abfd = bfd_openr (file_name, target);

   if (abfd == NULL)
   if (abfd == NULL)

-    bfd_fatal (filename);
+    bfd_fatal (file_name);

 
   if (bfd_check_format (abfd, bfd_archive))
 
   if (bfd_check_format (abfd, bfd_archive))

-    fatal (_("%s: can not get addresses from archive"), filename);
+    fatal (_("%s: can not get addresses from archive"), file_name);

 
   if (! bfd_check_format_matches (abfd, bfd_object, &matching))
     {
 
   if (! bfd_check_format_matches (abfd, bfd_object, &matching))
     {


@@ -278,7 +278,7 @@ main (argc, argv)
      int argc;
      char **argv;
 {
      int argc;
      char **argv;
 {

-  const char *filename;
+  const char *file_name;

   char *target;
   int c;
 
   char *target;
   int c;
 


@@ -297,7 +297,7 @@ main (argc, argv)
   bfd_init ();
   set_default_bfd_target ();
 
   bfd_init ();
   set_default_bfd_target ();
 

-  filename = NULL;
+  file_name = NULL;

   target = NULL;
   while ((c = getopt_long (argc, argv, "b:Ce:sfHhVv", long_options, (int *) 0))
         != EOF)
   target = NULL;
   while ((c = getopt_long (argc, argv, "b:Ce:sfHhVv", long_options, (int *) 0))
         != EOF)


@@ -324,7 +324,7 @@ main (argc, argv)
            }
          break;
        case 'e':
            }
          break;
        case 'e':

-         filename = optarg;
+         file_name = optarg;

          break;
        case 's':
          base_names = true;
          break;
        case 's':
          base_names = true;


@@ -346,13 +346,13 @@ main (argc, argv)
        }
     }
 
        }
     }
 

-  if (filename == NULL)
-    filename = "a.out";
+  if (file_name == NULL)
+    file_name = "a.out";

 
   addr = argv + optind;
   naddr = argc - optind;
 
 
   addr = argv + optind;
   naddr = argc - optind;
 

-  process_file (filename, target);
+  process_file (file_name, target);

 
   return 0;
 }
 
   return 0;
 }