Convert to ISO C90 formatting

1 files changed, 234 insertions, 349 deletions

diff --git a/bfd/xsym.c b/bfd/xsym.c
index 6b80dcf409..b54b74c2ac 100644
--- a/bfd/xsym.c
+++ b/bfd/xsym.c
@@ -23,40 +23,36 @@
 #include "sysdep.h"
 #include "libbfd.h"
 
-#define bfd_sym_close_and_cleanup _bfd_generic_close_and_cleanup
-#define bfd_sym_bfd_free_cached_info _bfd_generic_bfd_free_cached_info
-#define bfd_sym_new_section_hook _bfd_generic_new_section_hook
-#define bfd_sym_bfd_is_local_label_name bfd_generic_is_local_label_name
-#define bfd_sym_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
-#define bfd_sym_get_lineno _bfd_nosymbols_get_lineno
-#define bfd_sym_find_nearest_line _bfd_nosymbols_find_nearest_line
-#define bfd_sym_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
-#define bfd_sym_read_minisymbols _bfd_generic_read_minisymbols
-#define bfd_sym_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
-#define bfd_sym_get_reloc_upper_bound _bfd_norelocs_get_reloc_upper_bound
-#define bfd_sym_canonicalize_reloc _bfd_norelocs_canonicalize_reloc
-#define bfd_sym_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup
-#define bfd_sym_set_arch_mach _bfd_generic_set_arch_mach
-#define bfd_sym_get_section_contents _bfd_generic_get_section_contents
-#define bfd_sym_set_section_contents _bfd_generic_set_section_contents
-#define bfd_sym_bfd_get_relocated_section_contents bfd_generic_get_relocated_section_contents
-#define bfd_sym_bfd_relax_section bfd_generic_relax_section
-#define bfd_sym_bfd_gc_sections bfd_generic_gc_sections
-#define bfd_sym_bfd_merge_sections bfd_generic_merge_sections
-#define bfd_sym_bfd_is_group_section bfd_generic_is_group_section
-#define bfd_sym_bfd_discard_group bfd_generic_discard_group
-#define bfd_sym_section_already_linked \
-  _bfd_generic_section_already_linked
-#define bfd_sym_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
-#define bfd_sym_bfd_link_hash_table_free _bfd_generic_link_hash_table_free
-#define bfd_sym_bfd_link_add_symbols _bfd_generic_link_add_symbols
-#define bfd_sym_bfd_link_just_syms _bfd_generic_link_just_syms
-#define bfd_sym_bfd_final_link _bfd_generic_final_link
-#define bfd_sym_bfd_link_split_section _bfd_generic_link_split_section
-#define bfd_sym_get_section_contents_in_window  _bfd_generic_get_section_contents_in_window
-
-static unsigned long compute_offset
-  PARAMS ((unsigned long, unsigned long, unsigned long, unsigned long));
+#define bfd_sym_close_and_cleanup                   _bfd_generic_close_and_cleanup
+#define bfd_sym_bfd_free_cached_info                _bfd_generic_bfd_free_cached_info
+#define bfd_sym_new_section_hook                    _bfd_generic_new_section_hook
+#define bfd_sym_bfd_is_local_label_name             bfd_generic_is_local_label_name
+#define bfd_sym_bfd_is_target_special_symbol       ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#define bfd_sym_get_lineno                          _bfd_nosymbols_get_lineno
+#define bfd_sym_find_nearest_line                   _bfd_nosymbols_find_nearest_line
+#define bfd_sym_bfd_make_debug_symbol               _bfd_nosymbols_bfd_make_debug_symbol
+#define bfd_sym_read_minisymbols                    _bfd_generic_read_minisymbols
+#define bfd_sym_minisymbol_to_symbol                _bfd_generic_minisymbol_to_symbol
+#define bfd_sym_get_reloc_upper_bound               _bfd_norelocs_get_reloc_upper_bound
+#define bfd_sym_canonicalize_reloc                  _bfd_norelocs_canonicalize_reloc
+#define bfd_sym_bfd_reloc_type_lookup               _bfd_norelocs_bfd_reloc_type_lookup
+#define bfd_sym_set_arch_mach                       _bfd_generic_set_arch_mach
+#define bfd_sym_get_section_contents                _bfd_generic_get_section_contents
+#define bfd_sym_set_section_contents                _bfd_generic_set_section_contents
+#define bfd_sym_bfd_get_relocated_section_contents  bfd_generic_get_relocated_section_contents
+#define bfd_sym_bfd_relax_section                   bfd_generic_relax_section
+#define bfd_sym_bfd_gc_sections                     bfd_generic_gc_sections
+#define bfd_sym_bfd_merge_sections                  bfd_generic_merge_sections
+#define bfd_sym_bfd_is_group_section                bfd_generic_is_group_section
+#define bfd_sym_bfd_discard_group                   bfd_generic_discard_group
+#define bfd_sym_section_already_linked              _bfd_generic_section_already_linked
+#define bfd_sym_bfd_link_hash_table_create          _bfd_generic_link_hash_table_create
+#define bfd_sym_bfd_link_hash_table_free            _bfd_generic_link_hash_table_free
+#define bfd_sym_bfd_link_add_symbols                _bfd_generic_link_add_symbols
+#define bfd_sym_bfd_link_just_syms                  _bfd_generic_link_just_syms
+#define bfd_sym_bfd_final_link                      _bfd_generic_final_link
+#define bfd_sym_bfd_link_split_section              _bfd_generic_link_split_section
+#define bfd_sym_get_section_contents_in_window      _bfd_generic_get_section_contents_in_window
 
 extern const bfd_target sym_vec;
 
@@ -82,11 +78,10 @@ pstrcmp (const char *as, const char *bs)
 }
 
 static unsigned long
-compute_offset (first_page, page_size, entry_size, index)
-     unsigned long first_page;
-     unsigned long page_size;
-     unsigned long entry_size;
-     unsigned long index;
+compute_offset (unsigned long first_page,
+		unsigned long page_size,
+		unsigned long entry_size,
+		unsigned long index)
 {
   unsigned long entries_per_page = page_size / entry_size;
   unsigned long page_number = first_page + (index / entries_per_page);
@@ -96,25 +91,22 @@ compute_offset (first_page, page_size, entry_size, index)
 }
 
 bfd_boolean
-bfd_sym_mkobject (abfd)
-     bfd *abfd ATTRIBUTE_UNUSED;
+bfd_sym_mkobject (bfd *abfd ATTRIBUTE_UNUSED)
 {
   return 1;
 }
 
 void
-bfd_sym_print_symbol (abfd, afile, symbol, how)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     PTR afile ATTRIBUTE_UNUSED;
-     asymbol *symbol ATTRIBUTE_UNUSED;
-     bfd_print_symbol_type how ATTRIBUTE_UNUSED;
+bfd_sym_print_symbol (bfd *abfd ATTRIBUTE_UNUSED,
+		      void * afile ATTRIBUTE_UNUSED,
+		      asymbol *symbol ATTRIBUTE_UNUSED,
+		      bfd_print_symbol_type how ATTRIBUTE_UNUSED)
 {
   return;
 }
 
 bfd_boolean
-bfd_sym_valid (abfd)
-     bfd *abfd;
+bfd_sym_valid (bfd *abfd)
 {
   if (abfd == NULL || abfd->xvec == NULL)
     return 0;
@@ -123,16 +115,14 @@ bfd_sym_valid (abfd)
 }
 
 unsigned char *
-bfd_sym_read_name_table (abfd, dshb)
-     bfd *abfd;
-     bfd_sym_header_block *dshb;
+bfd_sym_read_name_table (bfd *abfd, bfd_sym_header_block *dshb)
 {
   unsigned char *rstr;
   long ret;
   size_t table_size = dshb->dshb_nte.dti_page_count * dshb->dshb_page_size;
   size_t table_offset = dshb->dshb_nte.dti_first_page * dshb->dshb_page_size;
 
-  rstr = (unsigned char *) bfd_alloc (abfd, table_size);
+  rstr = bfd_alloc (abfd, table_size);
   if (rstr == NULL)
     return rstr;
 
@@ -148,10 +138,9 @@ bfd_sym_read_name_table (abfd, dshb)
 }
 
 void
-bfd_sym_parse_file_reference_v32 (buf, len, entry)
-     unsigned char *buf;
-     size_t len;
-     bfd_sym_file_reference *entry;
+bfd_sym_parse_file_reference_v32 (unsigned char *buf,
+				  size_t len,
+				  bfd_sym_file_reference *entry)
 {
   BFD_ASSERT (len == 6);
 
@@ -160,10 +149,9 @@ bfd_sym_parse_file_reference_v32 (buf, len, entry)
 }
 
 void
-bfd_sym_parse_disk_table_v32 (buf, len, table)
-     unsigned char *buf;
-     size_t len;
-     bfd_sym_table_info *table;
+bfd_sym_parse_disk_table_v32 (unsigned char *buf,
+			      size_t len,
+			      bfd_sym_table_info *table)
 {
   BFD_ASSERT (len == 8);
 
@@ -173,10 +161,9 @@ bfd_sym_parse_disk_table_v32 (buf, len, table)
 }
 
 void
-bfd_sym_parse_header_v32 (buf, len, header)
-     unsigned char *buf;
-     size_t len;
-     bfd_sym_header_block *header;
+bfd_sym_parse_header_v32 (unsigned char *buf,
+			  size_t len,
+			  bfd_sym_header_block *header)
 {
   BFD_ASSERT (len == 154);
 
@@ -205,9 +192,7 @@ bfd_sym_parse_header_v32 (buf, len, header)
 }
 
 int
-bfd_sym_read_header_v32 (abfd, header)
-     bfd *abfd;
-     bfd_sym_header_block *header;
+bfd_sym_read_header_v32 (bfd *abfd, bfd_sym_header_block *header)
 {
   unsigned char buf[154];
   long ret;
@@ -222,18 +207,16 @@ bfd_sym_read_header_v32 (abfd, header)
 }
 
 int
-bfd_sym_read_header_v34 (abfd, header)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     bfd_sym_header_block *header ATTRIBUTE_UNUSED;
+bfd_sym_read_header_v34 (bfd *abfd ATTRIBUTE_UNUSED,
+			 bfd_sym_header_block *header ATTRIBUTE_UNUSED)
 {
   abort ();
 }
 
 int
-bfd_sym_read_header (abfd, header, version)
-     bfd *abfd;
-     bfd_sym_header_block *header;
-     bfd_sym_version version;
+bfd_sym_read_header (bfd *abfd,
+		     bfd_sym_header_block *header,
+		     bfd_sym_version version)
 {
   switch (version)
     {
@@ -245,14 +228,12 @@ bfd_sym_read_header (abfd, header, version)
       return bfd_sym_read_header_v32 (abfd, header);
     case BFD_SYM_VERSION_3_1:
     default:
-      return FALSE;
+      return 0;
     }
 }
 
 int
-bfd_sym_read_version (abfd, version)
-     bfd *abfd;
-     bfd_sym_version *version;
+bfd_sym_read_version (bfd *abfd, bfd_sym_version *version)
 {
   char version_string[32];
   long ret;
@@ -278,10 +259,9 @@ bfd_sym_read_version (abfd, version)
 }
 
 void
-bfd_sym_display_table_summary (f, dti, name)
-     FILE *f;
-     bfd_sym_table_info *dti;
-     const char *name;
+bfd_sym_display_table_summary (FILE *f,
+			       bfd_sym_table_info *dti,
+			       const char *name)
 {
   fprintf (f, "%-6s %13ld %13ld %13ld\n",
 	   name,
@@ -291,9 +271,7 @@ bfd_sym_display_table_summary (f, dti, name)
 }
 
 void
-bfd_sym_display_header (f, dshb)
-     FILE *f;
-     bfd_sym_header_block *dshb;
+bfd_sym_display_header (FILE *f, bfd_sym_header_block *dshb)
 {
   fprintf (f, "            Version: %.*s\n", dshb->dshb_id[0], dshb->dshb_id + 1);
   fprintf (f, "          Page Size: 0x%x\n", dshb->dshb_page_size);
@@ -327,10 +305,9 @@ bfd_sym_display_header (f, dshb)
 }
 
 void
-bfd_sym_parse_resources_table_entry_v32 (buf, len, entry)
-     unsigned char *buf;
-     size_t len;
-     bfd_sym_resources_table_entry *entry;
+bfd_sym_parse_resources_table_entry_v32 (unsigned char *buf,
+					 size_t len,
+					 bfd_sym_resources_table_entry *entry)
 {
   BFD_ASSERT (len == 18);
 
@@ -343,10 +320,9 @@ bfd_sym_parse_resources_table_entry_v32 (buf, len, entry)
 }
 
 void
-bfd_sym_parse_modules_table_entry_v33 (buf, len, entry)
-     unsigned char *buf;
-     size_t len;
-     bfd_sym_modules_table_entry *entry;
+bfd_sym_parse_modules_table_entry_v33 (unsigned char *buf,
+				       size_t len,
+				       bfd_sym_modules_table_entry *entry)
 {
   BFD_ASSERT (len == 46);
 
@@ -368,10 +344,9 @@ bfd_sym_parse_modules_table_entry_v33 (buf, len, entry)
 }
 
 void
-bfd_sym_parse_file_references_table_entry_v32 (buf, len, entry)
-     unsigned char *buf;
-     size_t len;
-     bfd_sym_file_references_table_entry *entry;
+bfd_sym_parse_file_references_table_entry_v32 (unsigned char *buf,
+					       size_t len,
+					       bfd_sym_file_references_table_entry *entry)
 {
   unsigned int type;
 
@@ -399,10 +374,9 @@ bfd_sym_parse_file_references_table_entry_v32 (buf, len, entry)
 }
 
 void
-bfd_sym_parse_contained_modules_table_entry_v32 (buf, len, entry)
-     unsigned char *buf;
-     size_t len;
-     bfd_sym_contained_modules_table_entry *entry;
+bfd_sym_parse_contained_modules_table_entry_v32 (unsigned char *buf,
+						 size_t len,
+						 bfd_sym_contained_modules_table_entry *entry)
 {
   unsigned int type;
 
@@ -425,10 +399,9 @@ bfd_sym_parse_contained_modules_table_entry_v32 (buf, len, entry)
 }
 
 void
-bfd_sym_parse_contained_variables_table_entry_v32 (buf, len, entry)
-     unsigned char *buf;
-     size_t len;
-     bfd_sym_contained_variables_table_entry *entry;
+bfd_sym_parse_contained_variables_table_entry_v32 (unsigned char *buf,
+						   size_t len,
+						   bfd_sym_contained_variables_table_entry *entry)
 {
   unsigned int type;
 
@@ -464,7 +437,8 @@ bfd_sym_parse_contained_variables_table_entry_v32 (buf, len, entry)
       else if (entry->entry.la_size <= BFD_SYM_CVTE_SCA)
 	{
 #if BFD_SYM_CVTE_SCA > 0
-	  memcpy (&entry->entry.address.lastruct.la, buf + 10, BFD_SYM_CVTE_SCA);
+	  memcpy (&entry->entry.address.lastruct.la, buf + 10,
+		  BFD_SYM_CVTE_SCA);
 #endif
 	  entry->entry.address.lastruct.la_kind = buf[23];
 	}
@@ -477,10 +451,9 @@ bfd_sym_parse_contained_variables_table_entry_v32 (buf, len, entry)
 }
 
 void
-bfd_sym_parse_contained_statements_table_entry_v32 (buf, len, entry)
-     unsigned char *buf;
-     size_t len;
-     bfd_sym_contained_statements_table_entry *entry;
+bfd_sym_parse_contained_statements_table_entry_v32 (unsigned char *buf,
+						    size_t len,
+						    bfd_sym_contained_statements_table_entry *entry)
 {
   unsigned int type;
 
@@ -509,10 +482,9 @@ bfd_sym_parse_contained_statements_table_entry_v32 (buf, len, entry)
 }
 
 void
-bfd_sym_parse_contained_labels_table_entry_v32 (buf, len, entry)
-     unsigned char *buf;
-     size_t len;
-     bfd_sym_contained_labels_table_entry *entry;
+bfd_sym_parse_contained_labels_table_entry_v32 (unsigned char *buf,
+						size_t len,
+						bfd_sym_contained_labels_table_entry *entry)
 {
   unsigned int type;
 
@@ -543,10 +515,9 @@ bfd_sym_parse_contained_labels_table_entry_v32 (buf, len, entry)
 }
 
 void
-bfd_sym_parse_type_table_entry_v32 (buf, len, entry)
-     unsigned char *buf;
-     size_t len;
-     bfd_sym_type_table_entry *entry;
+bfd_sym_parse_type_table_entry_v32 (unsigned char *buf,
+				    size_t len,
+				    bfd_sym_type_table_entry *entry)
 {
   BFD_ASSERT (len == 4);
 
@@ -554,13 +525,11 @@ bfd_sym_parse_type_table_entry_v32 (buf, len, entry)
 }
 
 int
-bfd_sym_fetch_resources_table_entry (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_resources_table_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_resources_table_entry (bfd *abfd,
+				     bfd_sym_resources_table_entry *entry,
+				     unsigned long index)
 {
-  void (*parser) PARAMS ((unsigned char *, size_t,
-			  bfd_sym_resources_table_entry *));
+  void (*parser) (unsigned char *, size_t, bfd_sym_resources_table_entry *);
   unsigned long offset;
   unsigned long entry_size;
   unsigned char buf[18];
@@ -607,13 +576,11 @@ bfd_sym_fetch_resources_table_entry (abfd, entry, index)
 }
 
 int
-bfd_sym_fetch_modules_table_entry (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_modules_table_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_modules_table_entry (bfd *abfd,
+				   bfd_sym_modules_table_entry *entry,
+				   unsigned long index)
 {
-  void (*parser) PARAMS ((unsigned char *, size_t,
-			  bfd_sym_modules_table_entry *));
+  void (*parser) (unsigned char *, size_t, bfd_sym_modules_table_entry *);
   unsigned long offset;
   unsigned long entry_size;
   unsigned char buf[46];
@@ -660,13 +627,11 @@ bfd_sym_fetch_modules_table_entry (abfd, entry, index)
 }
 
 int
-bfd_sym_fetch_file_references_table_entry (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_file_references_table_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_file_references_table_entry (bfd *abfd,
+					   bfd_sym_file_references_table_entry *entry,
+					   unsigned long index)
 {
-  void (*parser) PARAMS ((unsigned char *, size_t,
-			  bfd_sym_file_references_table_entry *));
+  void (*parser) (unsigned char *, size_t, bfd_sym_file_references_table_entry *);
   unsigned long offset;
   unsigned long entry_size = 0;
   unsigned char buf[8];
@@ -712,13 +677,11 @@ bfd_sym_fetch_file_references_table_entry (abfd, entry, index)
 }
 
 int
-bfd_sym_fetch_contained_modules_table_entry (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_contained_modules_table_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_contained_modules_table_entry (bfd *abfd,
+					     bfd_sym_contained_modules_table_entry *entry,
+					     unsigned long index)
 {
-  void (*parser) PARAMS ((unsigned char *, size_t,
-			  bfd_sym_contained_modules_table_entry *));
+  void (*parser) (unsigned char *, size_t, bfd_sym_contained_modules_table_entry *);
   unsigned long offset;
   unsigned long entry_size = 0;
   unsigned char buf[6];
@@ -764,13 +727,11 @@ bfd_sym_fetch_contained_modules_table_entry (abfd, entry, index)
 }
 
 int
-bfd_sym_fetch_contained_variables_table_entry (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_contained_variables_table_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_contained_variables_table_entry (bfd *abfd,
+					       bfd_sym_contained_variables_table_entry *entry,
+					       unsigned long index)
 {
-  void (*parser) PARAMS ((unsigned char *, size_t,
-			  bfd_sym_contained_variables_table_entry *));
+  void (*parser) (unsigned char *, size_t, bfd_sym_contained_variables_table_entry *);
   unsigned long offset;
   unsigned long entry_size = 0;
   unsigned char buf[26];
@@ -816,13 +777,11 @@ bfd_sym_fetch_contained_variables_table_entry (abfd, entry, index)
 }
 
 int
-bfd_sym_fetch_contained_statements_table_entry (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_contained_statements_table_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_contained_statements_table_entry (bfd *abfd,
+						bfd_sym_contained_statements_table_entry *entry,
+						unsigned long index)
 {
-  void (*parser) PARAMS ((unsigned char *, size_t,
-			  bfd_sym_contained_statements_table_entry *));
+  void (*parser) (unsigned char *, size_t, bfd_sym_contained_statements_table_entry *);
   unsigned long offset;
   unsigned long entry_size = 0;
   unsigned char buf[8];
@@ -868,13 +827,11 @@ bfd_sym_fetch_contained_statements_table_entry (abfd, entry, index)
 }
 
 int
-bfd_sym_fetch_contained_labels_table_entry (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_contained_labels_table_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_contained_labels_table_entry (bfd *abfd,
+					    bfd_sym_contained_labels_table_entry *entry,
+					    unsigned long index)
 {
-  void (*parser) PARAMS ((unsigned char *, size_t,
-			  bfd_sym_contained_labels_table_entry *));
+  void (*parser) (unsigned char *, size_t, bfd_sym_contained_labels_table_entry *);
   unsigned long offset;
   unsigned long entry_size = 0;
   unsigned char buf[12];
@@ -920,13 +877,11 @@ bfd_sym_fetch_contained_labels_table_entry (abfd, entry, index)
 }
 
 int
-bfd_sym_fetch_contained_types_table_entry (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_contained_types_table_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_contained_types_table_entry (bfd *abfd,
+					   bfd_sym_contained_types_table_entry *entry,
+					   unsigned long index)
 {
-  void (*parser) PARAMS ((unsigned char *, size_t,
-			  bfd_sym_contained_types_table_entry *));
+  void (*parser) (unsigned char *, size_t, bfd_sym_contained_types_table_entry *);
   unsigned long offset;
   unsigned long entry_size = 0;
   unsigned char buf[0];
@@ -972,13 +927,11 @@ bfd_sym_fetch_contained_types_table_entry (abfd, entry, index)
 }
 
 int
-bfd_sym_fetch_file_references_index_table_entry (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_file_references_index_table_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_file_references_index_table_entry (bfd *abfd,
+						 bfd_sym_file_references_index_table_entry *entry,
+						 unsigned long index)
 {
-  void (*parser) PARAMS ((unsigned char *, size_t,
-			  bfd_sym_file_references_index_table_entry *));
+  void (*parser) (unsigned char *, size_t, bfd_sym_file_references_index_table_entry *);
   unsigned long offset;
   unsigned long entry_size = 0;
   unsigned char buf[0];
@@ -1024,13 +977,11 @@ bfd_sym_fetch_file_references_index_table_entry (abfd, entry, index)
 }
 
 int
-bfd_sym_fetch_constant_pool_entry (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_constant_pool_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_constant_pool_entry (bfd *abfd,
+				   bfd_sym_constant_pool_entry *entry,
+				   unsigned long index)
 {
-  void (*parser) PARAMS ((unsigned char *, size_t,
-			  bfd_sym_constant_pool_entry *));
+  void (*parser) (unsigned char *, size_t, bfd_sym_constant_pool_entry *);
   unsigned long offset;
   unsigned long entry_size = 0;
   unsigned char buf[0];
@@ -1076,13 +1027,11 @@ bfd_sym_fetch_constant_pool_entry (abfd, entry, index)
 }
 
 int
-bfd_sym_fetch_type_table_entry (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_type_table_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_type_table_entry (bfd *abfd,
+				bfd_sym_type_table_entry *entry,
+				unsigned long index)
 {
-  void (*parser) PARAMS ((unsigned char *, size_t,
-			  bfd_sym_type_table_entry *));
+  void (*parser) (unsigned char *, size_t, bfd_sym_type_table_entry *);
   unsigned long offset;
   unsigned long entry_size = 0;
   unsigned char buf[4];
@@ -1125,10 +1074,9 @@ bfd_sym_fetch_type_table_entry (abfd, entry, index)
 }
 
 int
-bfd_sym_fetch_type_information_table_entry (abfd, entry, offset)
-     bfd *abfd;
-     bfd_sym_type_information_table_entry *entry;
-     unsigned long offset;
+bfd_sym_fetch_type_information_table_entry (bfd *abfd,
+					    bfd_sym_type_information_table_entry *entry,
+					    unsigned long offset)
 {
   unsigned char buf[4];
   bfd_sym_data_struct *sdata = NULL;
@@ -1171,10 +1119,9 @@ bfd_sym_fetch_type_information_table_entry (abfd, entry, offset)
 }
 
 int
-bfd_sym_fetch_type_table_information (abfd, entry, index)
-     bfd *abfd;
-     bfd_sym_type_information_table_entry *entry;
-     unsigned long index;
+bfd_sym_fetch_type_table_information (bfd *abfd,
+				      bfd_sym_type_information_table_entry *entry,
+				      unsigned long index)
 {
   bfd_sym_type_table_entry tindex;
   bfd_sym_data_struct *sdata = NULL;
@@ -1196,9 +1143,7 @@ bfd_sym_fetch_type_table_information (abfd, entry, index)
 }
 
 const unsigned char *
-bfd_sym_symbol_name (abfd, index)
-     bfd *abfd;
-     unsigned long index;
+bfd_sym_symbol_name (bfd *abfd, unsigned long index)
 {
   bfd_sym_data_struct *sdata = NULL;
 
@@ -1217,9 +1162,7 @@ bfd_sym_symbol_name (abfd, index)
 }
 
 const unsigned char *
-bfd_sym_module_name (abfd, index)
-     bfd *abfd;
-     unsigned long index;
+bfd_sym_module_name (bfd *abfd, unsigned long index)
 {
   bfd_sym_modules_table_entry entry;
 
@@ -1230,8 +1173,7 @@ bfd_sym_module_name (abfd, index)
 }
 
 const char *
-bfd_sym_unparse_storage_kind (kind)
-     enum bfd_sym_storage_kind kind;
+bfd_sym_unparse_storage_kind (enum bfd_sym_storage_kind kind)
 {
   switch (kind)
     {
@@ -1244,8 +1186,7 @@ bfd_sym_unparse_storage_kind (kind)
 }
 
 const char *
-bfd_sym_unparse_storage_class (kind)
-     enum bfd_sym_storage_class kind;
+bfd_sym_unparse_storage_class (enum bfd_sym_storage_class kind)
 {
   switch (kind)
     {
@@ -1262,8 +1203,7 @@ bfd_sym_unparse_storage_class (kind)
 }
 
 const char *
-bfd_sym_unparse_module_kind (kind)
-     enum bfd_sym_module_kind kind;
+bfd_sym_unparse_module_kind (enum bfd_sym_module_kind kind)
 {
   switch (kind)
     {
@@ -1279,8 +1219,7 @@ bfd_sym_unparse_module_kind (kind)
 }
 
 const char *
-bfd_sym_unparse_symbol_scope (scope)
-     enum bfd_sym_symbol_scope scope;
+bfd_sym_unparse_symbol_scope (enum bfd_sym_symbol_scope scope)
 {
   switch (scope)
     {
@@ -1292,10 +1231,9 @@ bfd_sym_unparse_symbol_scope (scope)
 }
 
 void
-bfd_sym_print_file_reference (abfd, f, entry)
-     bfd *abfd;
-     FILE *f;
-     bfd_sym_file_reference *entry;
+bfd_sym_print_file_reference (bfd *abfd,
+			      FILE *f,
+			      bfd_sym_file_reference *entry)
 {
   bfd_sym_file_references_table_entry frtentry;
   int ret;
@@ -1315,10 +1253,9 @@ bfd_sym_print_file_reference (abfd, f, entry)
 }
 
 void
-bfd_sym_print_resources_table_entry (abfd, f, entry)
-     bfd *abfd;
-     FILE *f;
-     bfd_sym_resources_table_entry *entry;
+bfd_sym_print_resources_table_entry (bfd *abfd,
+				     FILE *f,
+				     bfd_sym_resources_table_entry *entry)
 {
   fprintf (f, " \"%.*s\" (NTE %lu), type \"%.4s\", num %u, size %lu, MTE %lu -- %lu",
 	   bfd_sym_symbol_name (abfd, entry->rte_nte_index)[0],
@@ -1328,10 +1265,9 @@ bfd_sym_print_resources_table_entry (abfd, f, entry)
 }
 
 void
-bfd_sym_print_modules_table_entry (abfd, f, entry)
-     bfd *abfd;
-     FILE *f;
-     bfd_sym_modules_table_entry *entry;
+bfd_sym_print_modules_table_entry (bfd *abfd,
+				   FILE *f,
+				   bfd_sym_modules_table_entry *entry)
 {
   fprintf (f, "\"%.*s\" (NTE %lu)",
 	   bfd_sym_symbol_name (abfd, entry->mte_nte_index)[0],
@@ -1371,10 +1307,9 @@ bfd_sym_print_modules_table_entry (abfd, f, entry)
 }
 
 void
-bfd_sym_print_file_references_table_entry (abfd, f, entry)
-     bfd *abfd;
-     FILE *f;
-     bfd_sym_file_references_table_entry *entry;
+bfd_sym_print_file_references_table_entry (bfd *abfd,
+					   FILE *f,
+					   bfd_sym_file_references_table_entry *entry)
 {
   switch (entry->generic.type)
     {
@@ -1404,10 +1339,9 @@ bfd_sym_print_file_references_table_entry (abfd, f, entry)
 }
 
 void
-bfd_sym_print_contained_modules_table_entry (abfd, f, entry)
-     bfd *abfd;
-     FILE *f;
-     bfd_sym_contained_modules_table_entry *entry;
+bfd_sym_print_contained_modules_table_entry (bfd *abfd,
+					     FILE *f,
+					     bfd_sym_contained_modules_table_entry *entry)
 {
   switch (entry->generic.type)
     {
@@ -1426,10 +1360,9 @@ bfd_sym_print_contained_modules_table_entry (abfd, f, entry)
 }
 
 void
-bfd_sym_print_contained_variables_table_entry (abfd, f, entry)
-     bfd *abfd;
-     FILE *f;
-     bfd_sym_contained_variables_table_entry *entry;
+bfd_sym_print_contained_variables_table_entry (bfd *abfd,
+					       FILE *f,
+					       bfd_sym_contained_variables_table_entry *entry)
 {
   if (entry->generic.type == BFD_SYM_END_OF_LIST)
     {
@@ -1477,10 +1410,9 @@ bfd_sym_print_contained_variables_table_entry (abfd, f, entry)
 }
 
 void
-bfd_sym_print_contained_statements_table_entry (abfd, f, entry)
-     bfd *abfd;
-     FILE *f;
-     bfd_sym_contained_statements_table_entry *entry;
+bfd_sym_print_contained_statements_table_entry (bfd *abfd,
+						FILE *f,
+						bfd_sym_contained_statements_table_entry *entry)
 {
   if (entry->generic.type == BFD_SYM_END_OF_LIST)
     {
@@ -1504,10 +1436,9 @@ bfd_sym_print_contained_statements_table_entry (abfd, f, entry)
 }
 
 void
-bfd_sym_print_contained_labels_table_entry (abfd, f, entry)
-     bfd *abfd;
-     FILE *f;
-     bfd_sym_contained_labels_table_entry *entry;
+bfd_sym_print_contained_labels_table_entry (bfd *abfd,
+					    FILE *f,
+					    bfd_sym_contained_labels_table_entry *entry)
 {
   if (entry->generic.type == BFD_SYM_END_OF_LIST)
     {
@@ -1532,17 +1463,15 @@ bfd_sym_print_contained_labels_table_entry (abfd, f, entry)
 }
 
 void
-bfd_sym_print_contained_types_table_entry (abfd, f, entry)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     FILE *f;
-     bfd_sym_contained_types_table_entry *entry ATTRIBUTE_UNUSED;
+bfd_sym_print_contained_types_table_entry (bfd *abfd ATTRIBUTE_UNUSED,
+					   FILE *f,
+					   bfd_sym_contained_types_table_entry *entry ATTRIBUTE_UNUSED)
 {
   fprintf (f, "[UNIMPLEMENTED]");
 }
 
 const char *
-bfd_sym_type_operator_name (num)
-     unsigned char num;
+bfd_sym_type_operator_name (unsigned char num)
 {
   switch (num)
     {
@@ -1565,8 +1494,7 @@ bfd_sym_type_operator_name (num)
 }
 
 const char *
-bfd_sym_type_basic_name (num)
-     unsigned char num;
+bfd_sym_type_basic_name (unsigned char num)
 {
   switch (num)
     {
@@ -1593,12 +1521,11 @@ bfd_sym_type_basic_name (num)
 }
 
 int
-bfd_sym_fetch_long (buf, len, offset, offsetptr, value)
-     unsigned char *buf;
-     unsigned long len;
-     unsigned long offset;
-     unsigned long *offsetptr;
-     long *value;
+bfd_sym_fetch_long (unsigned char *buf,
+		    unsigned long len,
+		    unsigned long offset,
+		    unsigned long *offsetptr,
+		    long *value)
 {
   int ret;
 
@@ -1660,13 +1587,12 @@ bfd_sym_fetch_long (buf, len, offset, offsetptr, value)
 }
 
 void
-bfd_sym_print_type_information (abfd, f, buf, len, offset, offsetptr)
-     bfd *abfd;
-     FILE *f;
-     unsigned char *buf;
-     unsigned long len;
-     unsigned long offset;
-     unsigned long *offsetptr;
+bfd_sym_print_type_information (bfd *abfd,
+				FILE *f,
+				unsigned char *buf,
+				unsigned long len,
+				unsigned long offset,
+				unsigned long *offsetptr)
 {
   unsigned int type;
 
@@ -1858,10 +1784,9 @@ bfd_sym_print_type_information (abfd, f, buf, len, offset, offsetptr)
 }
 
 void
-bfd_sym_print_type_information_table_entry (abfd, f, entry)
-     bfd *abfd;
-     FILE *f;
-     bfd_sym_type_information_table_entry *entry;
+bfd_sym_print_type_information_table_entry (bfd *abfd,
+					    FILE *f,
+					    bfd_sym_type_information_table_entry *entry)
 {
   unsigned char *buf;
   unsigned long offset;
@@ -1907,31 +1832,29 @@ bfd_sym_print_type_information_table_entry (abfd, f, entry)
   bfd_sym_print_type_information (abfd, f, buf, entry->physical_size, 0, &offset);
 
   if (offset != entry->physical_size)
-    fprintf (f, "\n            [parser used %lu bytes instead of %lu]", offset, entry->physical_size);        }
+    fprintf (f, "\n            [parser used %lu bytes instead of %lu]", offset, entry->physical_size);
+}
 
 void
-bfd_sym_print_file_references_index_table_entry (abfd, f, entry)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     FILE *f;
-     bfd_sym_file_references_index_table_entry *entry ATTRIBUTE_UNUSED;
+bfd_sym_print_file_references_index_table_entry (bfd *abfd ATTRIBUTE_UNUSED,
+						 FILE *f,
+						 bfd_sym_file_references_index_table_entry *entry ATTRIBUTE_UNUSED)
 {
   fprintf (f, "[UNIMPLEMENTED]");
 }
 
 void
-bfd_sym_print_constant_pool_entry (abfd, f, entry)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     FILE *f;
-     bfd_sym_constant_pool_entry *entry ATTRIBUTE_UNUSED;
+bfd_sym_print_constant_pool_entry (bfd *abfd ATTRIBUTE_UNUSED,
+				   FILE *f,
+				   bfd_sym_constant_pool_entry *entry ATTRIBUTE_UNUSED)
 {
   fprintf (f, "[UNIMPLEMENTED]");
 }
 
 unsigned char *
-bfd_sym_display_name_table_entry (abfd, f, entry)
-     bfd *abfd;
-     FILE *f;
-     unsigned char *entry;
+bfd_sym_display_name_table_entry (bfd *abfd,
+				  FILE *f,
+				  unsigned char *entry)
 {
   unsigned long index;
   unsigned long offset;
@@ -1962,9 +1885,7 @@ bfd_sym_display_name_table_entry (abfd, f, entry)
 }
 
 void
-bfd_sym_display_name_table (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_name_table (bfd *abfd, FILE *f)
 {
   unsigned long name_table_len;
   unsigned char *name_table, *name_table_end, *cur;
@@ -1989,9 +1910,7 @@ bfd_sym_display_name_table (abfd, f)
 }
 
 void
-bfd_sym_display_resources_table (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_resources_table (bfd *abfd, FILE *f)
 {
   unsigned long i;
   bfd_sym_resources_table_entry entry;
@@ -2017,9 +1936,7 @@ bfd_sym_display_resources_table (abfd, f)
 }
 
 void
-bfd_sym_display_modules_table (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_modules_table (bfd *abfd, FILE *f)
 {
   unsigned long i;
   bfd_sym_modules_table_entry entry;
@@ -2045,9 +1962,7 @@ bfd_sym_display_modules_table (abfd, f)
 }
 
 void
-bfd_sym_display_file_references_table (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_file_references_table (bfd *abfd, FILE *f)
 {
   unsigned long i;
   bfd_sym_file_references_table_entry entry;
@@ -2073,9 +1988,7 @@ bfd_sym_display_file_references_table (abfd, f)
 }
 
 void
-bfd_sym_display_contained_modules_table (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_contained_modules_table (bfd *abfd, FILE *f)
 {
   unsigned long i;
   bfd_sym_contained_modules_table_entry entry;
@@ -2101,9 +2014,7 @@ bfd_sym_display_contained_modules_table (abfd, f)
 }
 
 void
-bfd_sym_display_contained_variables_table (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_contained_variables_table (bfd *abfd, FILE *f)
 {
   unsigned long i;
   bfd_sym_contained_variables_table_entry entry;
@@ -2131,9 +2042,7 @@ bfd_sym_display_contained_variables_table (abfd, f)
 }
 
 void
-bfd_sym_display_contained_statements_table (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_contained_statements_table (bfd *abfd, FILE *f)
 {
   unsigned long i;
   bfd_sym_contained_statements_table_entry entry;
@@ -2159,9 +2068,7 @@ bfd_sym_display_contained_statements_table (abfd, f)
 }
 
 void
-bfd_sym_display_contained_labels_table (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_contained_labels_table (bfd *abfd, FILE *f)
 {
   unsigned long i;
   bfd_sym_contained_labels_table_entry entry;
@@ -2187,9 +2094,7 @@ bfd_sym_display_contained_labels_table (abfd, f)
 }
 
 void
-bfd_sym_display_contained_types_table (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_contained_types_table (bfd *abfd, FILE *f)
 {
   unsigned long i;
   bfd_sym_contained_types_table_entry entry;
@@ -2215,9 +2120,7 @@ bfd_sym_display_contained_types_table (abfd, f)
 }
 
 void
-bfd_sym_display_file_references_index_table (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_file_references_index_table (bfd *abfd, FILE *f)
 {
   unsigned long i;
   bfd_sym_file_references_index_table_entry entry;
@@ -2243,9 +2146,7 @@ bfd_sym_display_file_references_index_table (abfd, f)
 }
 
 void
-bfd_sym_display_constant_pool (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_constant_pool (bfd *abfd, FILE *f)
 {
   unsigned long i;
   bfd_sym_constant_pool_entry entry;
@@ -2271,9 +2172,7 @@ bfd_sym_display_constant_pool (abfd, f)
 }
 
 void
-bfd_sym_display_type_information_table (abfd, f)
-     bfd *abfd;
-     FILE *f;
+bfd_sym_display_type_information_table (bfd *abfd, FILE *f)
 {
   unsigned long i;
   bfd_sym_type_table_entry index;
@@ -2311,10 +2210,7 @@ bfd_sym_display_type_information_table (abfd, f)
 }
 
 int
-bfd_sym_scan (abfd, version, mdata)
-     bfd *abfd;
-     bfd_sym_version version;
-     bfd_sym_data_struct *mdata;
+bfd_sym_scan (bfd *abfd, bfd_sym_version version, bfd_sym_data_struct *mdata)
 {
   asection *bfdsec;
   const char *name = "symbols";
@@ -2349,8 +2245,7 @@ bfd_sym_scan (abfd, version, mdata)
 }
 
 const bfd_target *
-bfd_sym_object_p (abfd)
-     bfd *abfd;
+bfd_sym_object_p (bfd *abfd)
 {
   struct bfd_preserve preserve;
   bfd_sym_version version = -1;
@@ -2382,77 +2277,68 @@ bfd_sym_object_p (abfd)
 }
 
 asymbol *
-bfd_sym_make_empty_symbol (abfd)
-     bfd *abfd;
+bfd_sym_make_empty_symbol (bfd *abfd)
 {
-  return (asymbol *) bfd_alloc (abfd, sizeof (asymbol));
+  return bfd_alloc (abfd, sizeof (asymbol));
 }
 
 void
-bfd_sym_get_symbol_info (abfd, symbol, ret)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     asymbol *symbol;
-     symbol_info *ret;
+bfd_sym_get_symbol_info (bfd *abfd ATTRIBUTE_UNUSED, asymbol *symbol, symbol_info *ret)
 {
   bfd_symbol_info (symbol, ret);
 }
 
 long
-bfd_sym_get_symtab_upper_bound (abfd)
-     bfd *abfd ATTRIBUTE_UNUSED;
+bfd_sym_get_symtab_upper_bound (bfd *abfd ATTRIBUTE_UNUSED)
 {
   return 0;
 }
 
 long
-bfd_sym_canonicalize_symtab (abfd, sym)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     asymbol **sym ATTRIBUTE_UNUSED;
+bfd_sym_canonicalize_symtab (bfd *abfd ATTRIBUTE_UNUSED, asymbol **sym ATTRIBUTE_UNUSED)
 {
   return 0;
 }
 
 int
-bfd_sym_sizeof_headers (abfd, exec)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     bfd_boolean exec ATTRIBUTE_UNUSED;
+bfd_sym_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED, bfd_boolean exec ATTRIBUTE_UNUSED)
 {
   return 0;
 }
 
 const bfd_target sym_vec =
 {
-  "sym",			/* name */
-  bfd_target_sym_flavour,	/* flavour */
-  BFD_ENDIAN_BIG,		/* byteorder */
-  BFD_ENDIAN_BIG,		/* header_byteorder */
-  (HAS_RELOC | EXEC_P |		/* object flags */
+  "sym",			/* Name.  */
+  bfd_target_sym_flavour,	/* Flavour.  */
+  BFD_ENDIAN_BIG,		/* Byteorder.  */
+  BFD_ENDIAN_BIG,		/* Header byteorder.  */
+  (HAS_RELOC | EXEC_P |		/* Object flags.  */
    HAS_LINENO | HAS_DEBUG |
    HAS_SYMS | HAS_LOCALS | DYNAMIC | WP_TEXT | D_PAGED),
   (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE | SEC_DATA
-   | SEC_ROM | SEC_HAS_CONTENTS), /* section_flags */
-  0,				/* symbol_leading_char */
-  ' ',				/* ar_pad_char */
-  16,				/* ar_max_namelen */
+   | SEC_ROM | SEC_HAS_CONTENTS), /* Section_flags.  */
+  0,				/* Symbol_leading_char.  */
+  ' ',				/* AR_pad_char.  */
+  16,				/* AR_max_namelen.  */
   bfd_getb64, bfd_getb_signed_64, bfd_putb64,
   bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* data */
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Data.  */
   bfd_getb64, bfd_getb_signed_64, bfd_putb64,
   bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* hdrs */
-  {				/* bfd_check_format */
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* Hdrs.  */
+  {				/* bfd_check_format.  */
     _bfd_dummy_target,
-    bfd_sym_object_p,		/* bfd_check_format */
+    bfd_sym_object_p,		/* bfd_check_format.  */
     _bfd_dummy_target,
     _bfd_dummy_target,
   },
-  {				/* bfd_set_format */
+  {				/* bfd_set_format.  */
     bfd_false,
     bfd_sym_mkobject,
     bfd_false,
     bfd_false,
   },
-  {				/* bfd_write_contents */
+  {				/* bfd_write_contents.  */
     bfd_false,
     bfd_true,
     bfd_false,
@@ -2473,4 +2359,3 @@ const bfd_target sym_vec =
 
   NULL
 };
-