aboutsummaryrefslogtreecommitdiff
path: root/binutils/addr2line.c
diff options
context:
space:
mode:
Diffstat (limited to 'binutils/addr2line.c')
-rw-r--r--binutils/addr2line.c45
1 files changed, 18 insertions, 27 deletions
diff --git a/binutils/addr2line.c b/binutils/addr2line.c
index 8ebd87e..b5f5a0c 100644
--- a/binutils/addr2line.c
+++ b/binutils/addr2line.c
@@ -1,5 +1,6 @@
/* addr2line.c -- convert addresses to line number and function name
- Copyright 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003
+ Free Software Foundation, Inc.
Contributed by Ulrich Lauther <Ulrich.Lauther@mchp.siemens.de>
This file is part of GNU Binutils.
@@ -58,18 +59,16 @@ static struct option long_options[] =
{0, no_argument, 0, 0}
};
-static void usage PARAMS ((FILE *, int));
-static void slurp_symtab PARAMS ((bfd *));
-static void find_address_in_section PARAMS ((bfd *, asection *, PTR));
-static void translate_addresses PARAMS ((bfd *));
-static void process_file PARAMS ((const char *, const char *));
+static void usage (FILE *, int);
+static void slurp_symtab (bfd *);
+static void find_address_in_section (bfd *, asection *, void *);
+static void translate_addresses (bfd *);
+static void process_file (const char *, const char *);
/* Print a usage message to STREAM and exit with STATUS. */
static void
-usage (stream, status)
- FILE *stream;
- int status;
+usage (FILE *stream, int status)
{
fprintf (stream, _("Usage: %s [option(s)] [addr(s)]\n"), program_name);
fprintf (stream, _(" Convert addresses into line number/file name pairs.\n"));
@@ -93,8 +92,7 @@ usage (stream, status)
/* Read in the symbol table. */
static void
-slurp_symtab (abfd)
- bfd *abfd;
+slurp_symtab (bfd *abfd)
{
long symcount;
unsigned int size;
@@ -102,9 +100,9 @@ slurp_symtab (abfd)
if ((bfd_get_file_flags (abfd) & HAS_SYMS) == 0)
return;
- symcount = bfd_read_minisymbols (abfd, FALSE, (PTR) &syms, &size);
+ symcount = bfd_read_minisymbols (abfd, FALSE, (void *) &syms, &size);
if (symcount == 0)
- symcount = bfd_read_minisymbols (abfd, TRUE /* dynamic */, (PTR) &syms, &size);
+ symcount = bfd_read_minisymbols (abfd, TRUE /* dynamic */, (void *) &syms, &size);
if (symcount < 0)
bfd_fatal (bfd_get_filename (abfd));
@@ -123,10 +121,8 @@ static bfd_boolean found;
bfd_map_over_sections. */
static void
-find_address_in_section (abfd, section, data)
- bfd *abfd;
- asection *section;
- PTR data ATTRIBUTE_UNUSED;
+find_address_in_section (bfd *abfd, asection *section,
+ void *data ATTRIBUTE_UNUSED)
{
bfd_vma vma;
bfd_size_type size;
@@ -153,8 +149,7 @@ find_address_in_section (abfd, section, data)
file_name:line_number and optionally function name. */
static void
-translate_addresses (abfd)
- bfd *abfd;
+translate_addresses (bfd *abfd)
{
int read_stdin = (naddr == 0);
@@ -177,7 +172,7 @@ translate_addresses (abfd)
}
found = FALSE;
- bfd_map_over_sections (abfd, find_address_in_section, (PTR) NULL);
+ bfd_map_over_sections (abfd, find_address_in_section, NULL);
if (! found)
{
@@ -230,9 +225,7 @@ translate_addresses (abfd)
/* Process a file. */
static void
-process_file (file_name, target)
- const char *file_name;
- const char *target;
+process_file (const char *file_name, const char *target)
{
bfd *abfd;
char **matching;
@@ -268,12 +261,10 @@ process_file (file_name, target)
bfd_close (abfd);
}
-int main PARAMS ((int, char **));
+int main (int, char **);
int
-main (argc, argv)
- int argc;
- char **argv;
+main (int argc, char **argv)
{
const char *file_name;
char *target;