Convert to C90 and a few tweaks.

1 files changed, 61 insertions, 87 deletions

diff --git a/bfd/syms.c b/bfd/syms.c
index d0ffcc7..33fd9fd 100644
--- a/bfd/syms.c
+++ b/bfd/syms.c
@@ -77,7 +77,7 @@ SUBSECTION
 |	  if (storage_needed == 0)
 |	    return;
 |	  
-|	  symbol_table = (asymbol **) xmalloc (storage_needed);
+|	  symbol_table = xmalloc (storage_needed);
 |	    ...
 |	  number_of_symbols =
 |	     bfd_canonicalize_symtab (abfd, symbol_table);
@@ -122,7 +122,7 @@ SUBSECTION
 |	  new->value = 0x12345;
 |
 |	  ptrs[0] = new;
-|	  ptrs[1] = (asymbol *)0;
+|	  ptrs[1] = 0;
 |
 |	  bfd_set_symtab (abfd, ptrs, 1);
 |	  bfd_close (abfd);
@@ -298,7 +298,7 @@ CODE_FRAGMENT
 .  {* Back end special data.  *}
 .  union
 .    {
-.      PTR p;
+.      void *p;
 .      bfd_vma i;
 .    }
 .  udata;
@@ -314,10 +314,6 @@ CODE_FRAGMENT
 #include "bfdlink.h"
 #include "aout/stab_gnu.h"
 
-static char coff_section_type PARAMS ((const char *));
-static char decode_section_type PARAMS ((const struct sec *));
-static int cmpindexentry PARAMS ((const PTR, const PTR));
-
 /*
 DOCDD
 INODE
@@ -354,9 +350,7 @@ DESCRIPTION
 */
 
 bfd_boolean
-bfd_is_local_label (abfd, sym)
-     bfd *abfd;
-     asymbol *sym;
+bfd_is_local_label (bfd *abfd, asymbol *sym)
 {
   /* The BSF_SECTION_SYM check is needed for IA-64, where every label that
      starts with '.' is local.  This would accidentally catch section names
@@ -382,7 +376,7 @@ DESCRIPTION
 	local label.
 
 .#define bfd_is_local_label_name(abfd, name) \
-.     BFD_SEND (abfd, _bfd_is_local_label_name, (abfd, name))
+.  BFD_SEND (abfd, _bfd_is_local_label_name, (abfd, name))
 .
 */
 
@@ -398,8 +392,7 @@ DESCRIPTION
 	including the NULL.
 
 .#define bfd_canonicalize_symtab(abfd, location) \
-.     BFD_SEND (abfd, _bfd_canonicalize_symtab,\
-.                  (abfd, location))
+.  BFD_SEND (abfd, _bfd_canonicalize_symtab, (abfd, location))
 .
 */
 
@@ -408,7 +401,8 @@ FUNCTION
 	bfd_set_symtab
 
 SYNOPSIS
-	bfd_boolean bfd_set_symtab (bfd *abfd, asymbol **location, unsigned int count);
+	bfd_boolean bfd_set_symtab
+	  (bfd *abfd, asymbol **location, unsigned int count);
 
 DESCRIPTION
 	Arrange that when the output BFD @var{abfd} is closed,
@@ -417,12 +411,9 @@ DESCRIPTION
 */
 
 bfd_boolean
-bfd_set_symtab (abfd, location, symcount)
-     bfd *abfd;
-     asymbol **location;
-     unsigned int symcount;
+bfd_set_symtab (bfd *abfd, asymbol **location, unsigned int symcount)
 {
-  if ((abfd->format != bfd_object) || (bfd_read_p (abfd)))
+  if (abfd->format != bfd_object || bfd_read_p (abfd))
     {
       bfd_set_error (bfd_error_invalid_operation);
       return FALSE;
@@ -438,25 +429,21 @@ FUNCTION
 	bfd_print_symbol_vandf
 
 SYNOPSIS
-	void bfd_print_symbol_vandf (bfd *abfd, PTR file, asymbol *symbol);
+	void bfd_print_symbol_vandf (bfd *abfd, void *file, asymbol *symbol);
 
 DESCRIPTION
 	Print the value and flags of the @var{symbol} supplied to the
 	stream @var{file}.
 */
 void
-bfd_print_symbol_vandf (abfd, arg, symbol)
-     bfd *abfd;
-     PTR arg;
-     asymbol *symbol;
+bfd_print_symbol_vandf (bfd *abfd, void *arg, asymbol *symbol)
 {
-  FILE *file = (FILE *) arg;
+  FILE *file = arg;
 
   flagword type = symbol->flags;
 
-  if (symbol->section != (asection *) NULL)
-    bfd_fprintf_vma (abfd, file,
-		     symbol->value + symbol->section->vma);
+  if (symbol->section != NULL)
+    bfd_fprintf_vma (abfd, file, symbol->value + symbol->section->vma);
   else
     bfd_fprintf_vma (abfd, file, symbol->value);
 
@@ -493,7 +480,7 @@ DESCRIPTION
 	information, and will cause problems later on.
 
 .#define bfd_make_empty_symbol(abfd) \
-.     BFD_SEND (abfd, _bfd_make_empty_symbol, (abfd))
+.  BFD_SEND (abfd, _bfd_make_empty_symbol, (abfd))
 .
 */
 
@@ -502,7 +489,7 @@ FUNCTION
 	_bfd_generic_make_empty_symbol
 
 SYNOPSIS
-	asymbol * _bfd_generic_make_empty_symbol (bfd *);
+	asymbol *_bfd_generic_make_empty_symbol (bfd *);
 
 DESCRIPTION
 	Create a new <<asymbol>> structure for the BFD @var{abfd}
@@ -512,11 +499,10 @@ DESCRIPTION
 */
 
 asymbol *
-_bfd_generic_make_empty_symbol (abfd)
-     bfd *abfd;
+_bfd_generic_make_empty_symbol (bfd *abfd)
 {
   bfd_size_type amt = sizeof (asymbol);
-  asymbol *new = (asymbol *) bfd_zalloc (abfd, amt);
+  asymbol *new = bfd_zalloc (abfd, amt);
   if (new)
     new->the_bfd = abfd;
   return new;
@@ -532,7 +518,7 @@ DESCRIPTION
 	yet to be worked out.
 
 .#define bfd_make_debug_symbol(abfd,ptr,size) \
-.        BFD_SEND (abfd, _bfd_make_debug_symbol, (abfd, ptr, size))
+.  BFD_SEND (abfd, _bfd_make_debug_symbol, (abfd, ptr, size))
 .
 */
 
@@ -576,8 +562,7 @@ static const struct section_to_type stt[] =
    't' as well as .text */
 
 static char
-coff_section_type (s)
-     const char *s;
+coff_section_type (const char *s)
 {
   const struct section_to_type *t;
 
@@ -596,8 +581,7 @@ coff_section_type (s)
    we could perhaps obsolete coff_section_type.  */
 
 static char
-decode_section_type (section)
-     const struct sec *section;
+decode_section_type (const struct sec *section)
 {
   if (section->flags & SEC_CODE)
     return 't';
@@ -619,8 +603,7 @@ decode_section_type (section)
     }
   if (section->flags & SEC_DEBUGGING)
     return 'N';
-  if ((section->flags & SEC_HAS_CONTENTS) &&
-      (section->flags & SEC_READONLY))
+  if ((section->flags & SEC_HAS_CONTENTS) && (section->flags & SEC_READONLY))
     return 'n';
 
   return '?';
@@ -638,8 +621,7 @@ SYNOPSIS
 	int bfd_decode_symclass (asymbol *symbol);
 */
 int
-bfd_decode_symclass (symbol)
-     asymbol *symbol;
+bfd_decode_symclass (asymbol *symbol)
 {
   char c;
 
@@ -711,8 +693,7 @@ SYNOPSIS
 */
 
 bfd_boolean
-bfd_is_undefined_symclass (symclass)
-     int symclass;
+bfd_is_undefined_symclass (int symclass)
 {
   return symclass == 'U' || symclass == 'w' || symclass == 'v';
 }
@@ -731,9 +712,7 @@ SYNOPSIS
 */
 
 void
-bfd_symbol_info (symbol, ret)
-     asymbol *symbol;
-     symbol_info *ret;
+bfd_symbol_info (asymbol *symbol, symbol_info *ret)
 {
   ret->type = bfd_decode_symclass (symbol);
 
@@ -750,7 +729,8 @@ FUNCTION
 	bfd_copy_private_symbol_data
 
 SYNOPSIS
-	bfd_boolean bfd_copy_private_symbol_data (bfd *ibfd, asymbol *isym, bfd *obfd, asymbol *osym);
+	bfd_boolean bfd_copy_private_symbol_data
+	  (bfd *ibfd, asymbol *isym, bfd *obfd, asymbol *osym);
 
 DESCRIPTION
 	Copy private symbol information from @var{isym} in the BFD
@@ -762,8 +742,8 @@ DESCRIPTION
 	Not enough memory exists to create private data for @var{osec}.
 
 .#define bfd_copy_private_symbol_data(ibfd, isymbol, obfd, osymbol) \
-.     BFD_SEND (obfd, _bfd_copy_private_symbol_data, \
-.		(ibfd, isymbol, obfd, osymbol))
+.  BFD_SEND (obfd, _bfd_copy_private_symbol_data, \
+.            (ibfd, isymbol, obfd, osymbol))
 .
 */
 
@@ -772,11 +752,10 @@ DESCRIPTION
    version.  It just uses BFD asymbol structures as mini symbols.  */
 
 long
-_bfd_generic_read_minisymbols (abfd, dynamic, minisymsp, sizep)
-     bfd *abfd;
-     bfd_boolean dynamic;
-     PTR *minisymsp;
-     unsigned int *sizep;
+_bfd_generic_read_minisymbols (bfd *abfd,
+			       bfd_boolean dynamic,
+			       void **minisymsp,
+			       unsigned int *sizep)
 {
   long storage;
   asymbol **syms = NULL;
@@ -791,7 +770,7 @@ _bfd_generic_read_minisymbols (abfd, dynamic, minisymsp, sizep)
   if (storage == 0)
     return 0;
 
-  syms = (asymbol **) bfd_malloc ((bfd_size_type) storage);
+  syms = bfd_malloc (storage);
   if (syms == NULL)
     goto error_return;
 
@@ -802,7 +781,7 @@ _bfd_generic_read_minisymbols (abfd, dynamic, minisymsp, sizep)
   if (symcount < 0)
     goto error_return;
 
-  *minisymsp = (PTR) syms;
+  *minisymsp = syms;
   *sizep = sizeof (asymbol *);
   return symcount;
 
@@ -818,11 +797,10 @@ _bfd_generic_read_minisymbols (abfd, dynamic, minisymsp, sizep)
    we just return the asymbol the minisymbol points to.  */
 
 asymbol *
-_bfd_generic_minisymbol_to_symbol (abfd, dynamic, minisym, sym)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     bfd_boolean dynamic ATTRIBUTE_UNUSED;
-     const PTR minisym;
-     asymbol *sym ATTRIBUTE_UNUSED;
+_bfd_generic_minisymbol_to_symbol (bfd *abfd ATTRIBUTE_UNUSED,
+				   bfd_boolean dynamic ATTRIBUTE_UNUSED,
+				   const void *minisym,
+				   asymbol *sym ATTRIBUTE_UNUSED)
 {
   return *(asymbol **) minisym;
 }
@@ -857,12 +835,10 @@ struct indexentry
 /* Compare two indexentry structures.  This is called via qsort.  */
 
 static int
-cmpindexentry (a, b)
-     const PTR a;
-     const PTR b;
+cmpindexentry (const void *a, const void *b)
 {
-  const struct indexentry *contestantA = (const struct indexentry *) a;
-  const struct indexentry *contestantB = (const struct indexentry *) b;
+  const struct indexentry *contestantA = a;
+  const struct indexentry *contestantB = b;
 
   if (contestantA->val < contestantB->val)
     return -1;
@@ -903,17 +879,15 @@ struct stab_find_info
 };
 
 bfd_boolean
-_bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound,
-				     pfilename, pfnname, pline, pinfo)
-     bfd *abfd;
-     asymbol **symbols;
-     asection *section;
-     bfd_vma offset;
-     bfd_boolean *pfound;
-     const char **pfilename;
-     const char **pfnname;
-     unsigned int *pline;
-     PTR *pinfo;
+_bfd_stab_section_find_nearest_line (bfd *abfd,
+				     asymbol **symbols,
+				     asection *section,
+				     bfd_vma offset,
+				     bfd_boolean *pfound,
+				     const char **pfilename,
+				     const char **pfnname,
+				     unsigned int *pline,
+				     void **pinfo)
 {
   struct stab_find_info *info;
   bfd_size_type stabsize, strsize;
@@ -951,7 +925,7 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound,
 #define VALOFF (8)
 #define STABSIZE (12)
 
-  info = (struct stab_find_info *) *pinfo;
+  info = *pinfo;
   if (info != NULL)
     {
       if (info->stabsec == NULL || info->strsec == NULL)
@@ -972,7 +946,7 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound,
       char *function_name;
       bfd_size_type amt = sizeof *info;
 
-      info = (struct stab_find_info *) bfd_zalloc (abfd, amt);
+      info = bfd_zalloc (abfd, amt);
       if (info == NULL)
 	return FALSE;
 
@@ -987,15 +961,15 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound,
 	{
 	  /* No stabs debugging information.  Set *pinfo so that we
              can return quickly in the info != NULL case above.  */
-	  *pinfo = (PTR) info;
+	  *pinfo = info;
 	  return TRUE;
 	}
 
       stabsize = info->stabsec->_raw_size;
       strsize = info->strsec->_raw_size;
 
-      info->stabs = (bfd_byte *) bfd_alloc (abfd, stabsize);
-      info->strs = (bfd_byte *) bfd_alloc (abfd, strsize);
+      info->stabs = bfd_alloc (abfd, stabsize);
+      info->strs = bfd_alloc (abfd, strsize);
       if (info->stabs == NULL || info->strs == NULL)
 	return FALSE;
 
@@ -1012,7 +986,7 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound,
       reloc_size = bfd_get_reloc_upper_bound (abfd, info->stabsec);
       if (reloc_size < 0)
 	return FALSE;
-      reloc_vector = (arelent **) bfd_malloc ((bfd_size_type) reloc_size);
+      reloc_vector = bfd_malloc (reloc_size);
       if (reloc_vector == NULL && reloc_size != 0)
 	return FALSE;
       reloc_count = bfd_canonicalize_reloc (abfd, info->stabsec, reloc_vector,
@@ -1105,7 +1079,7 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound,
 
       amt = info->indextablesize;
       amt *= sizeof (struct indexentry);
-      info->indextable = (struct indexentry *) bfd_alloc (abfd, amt);
+      info->indextable = bfd_alloc (abfd, amt);
       if (info->indextable == NULL)
 	return FALSE;
 
@@ -1226,7 +1200,7 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound,
       qsort (info->indextable, (size_t) i, sizeof (struct indexentry),
 	     cmpindexentry);
 
-      *pinfo = (PTR) info;
+      *pinfo = info;
     }
 
   /* We are passed a section relative offset.  The offsets in the
@@ -1360,7 +1334,7 @@ _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound,
 	  if (info->filename != NULL)
 	    free (info->filename);
 	  len = strlen (file_name) + 1;
-	  info->filename = (char *) bfd_malloc ((bfd_size_type) dirlen + len);
+	  info->filename = bfd_malloc (dirlen + len);
 	  if (info->filename == NULL)
 	    return FALSE;
 	  memcpy (info->filename, directory_name, dirlen);