Convert to ISO C90 formatting

1 files changed, 83 insertions, 141 deletions

diff --git a/bfd/ihex.c b/bfd/ihex.c
index c692b03b33..d063502204 100644
--- a/bfd/ihex.c
+++ b/bfd/ihex.c
@@ -1,5 +1,5 @@
 /* BFD back-end for Intel Hex objects.
-   Copyright 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+   Copyright 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
    Free Software Foundation, Inc.
    Written by Ian Lance Taylor of Cygnus Support <ian@cygnus.com>.
 
@@ -116,8 +116,7 @@ The MRI compiler uses this, which is a repeat of type 5:
    10..13	Upper 16 bits of start address
    14..17	Lower 16 bits of start address
    18..19	Checksum in hex notation
-   20..21	Carriage return, line feed
-*/
+   20..21	Carriage return, line feed.  */
 
 #include "bfd.h"
 #include "sysdep.h"
@@ -125,33 +124,6 @@ The MRI compiler uses this, which is a repeat of type 5:
 #include "libiberty.h"
 #include "safe-ctype.h"
 
-static void ihex_init
-  PARAMS ((void));
-static bfd_boolean ihex_mkobject
-  PARAMS ((bfd *));
-static INLINE int ihex_get_byte
-  PARAMS ((bfd *, bfd_boolean *));
-static void ihex_bad_byte
-  PARAMS ((bfd *, unsigned int, int, bfd_boolean));
-static bfd_boolean ihex_scan
-  PARAMS ((bfd *));
-static const bfd_target *ihex_object_p
-  PARAMS ((bfd *));
-static bfd_boolean ihex_read_section
-  PARAMS ((bfd *, asection *, bfd_byte *));
-static bfd_boolean ihex_get_section_contents
-  PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
-static bfd_boolean ihex_set_section_contents
-  PARAMS ((bfd *, asection *, const PTR, file_ptr, bfd_size_type));
-static bfd_boolean ihex_write_record
-  PARAMS ((bfd *, size_t, unsigned int, unsigned int, bfd_byte *));
-static bfd_boolean ihex_write_object_contents
-  PARAMS ((bfd *));
-static bfd_boolean ihex_set_arch_mach
-  PARAMS ((bfd *, enum bfd_architecture, unsigned long));
-static int ihex_sizeof_headers
-  PARAMS ((bfd *, bfd_boolean));
-
 /* The number of bytes we put on one line during output.  */
 
 #define CHUNK 16
@@ -185,7 +157,7 @@ struct ihex_data_struct
 /* Initialize by filling in the hex conversion array.  */
 
 static void
-ihex_init ()
+ihex_init (void)
 {
   static bfd_boolean inited;
 
@@ -199,13 +171,11 @@ ihex_init ()
 /* Create an ihex object.  */
 
 static bfd_boolean
-ihex_mkobject (abfd)
-     bfd *abfd;
+ihex_mkobject (bfd *abfd)
 {
   struct ihex_data_struct *tdata;
-  bfd_size_type amt = sizeof (struct ihex_data_struct);
 
-  tdata = (struct ihex_data_struct *) bfd_alloc (abfd, amt);
+  tdata = bfd_alloc (abfd, sizeof (* tdata));
   if (tdata == NULL)
     return FALSE;
 
@@ -219,9 +189,7 @@ ihex_mkobject (abfd)
    Return EOF on error or end of file.  */
 
 static INLINE int
-ihex_get_byte (abfd, errorptr)
-     bfd *abfd;
-     bfd_boolean *errorptr;
+ihex_get_byte (bfd *abfd, bfd_boolean *errorptr)
 {
   bfd_byte c;
 
@@ -238,11 +206,7 @@ ihex_get_byte (abfd, errorptr)
 /* Report a problem in an Intel Hex file.  */
 
 static void
-ihex_bad_byte (abfd, lineno, c, error)
-     bfd *abfd;
-     unsigned int lineno;
-     int c;
-     bfd_boolean error;
+ihex_bad_byte (bfd *abfd, unsigned int lineno, int c, bfd_boolean error)
 {
   if (c == EOF)
     {
@@ -271,8 +235,7 @@ ihex_bad_byte (abfd, lineno, c, error)
    section for each contiguous set of bytes.  */
 
 static bfd_boolean
-ihex_scan (abfd)
-     bfd *abfd;
+ihex_scan (bfd *abfd)
 {
   bfd_vma segbase;
   bfd_vma extbase;
@@ -344,7 +307,7 @@ ihex_scan (abfd)
 	  chars = len * 2 + 2;
 	  if (chars >= bufsize)
 	    {
-	      buf = (bfd_byte *) bfd_realloc (buf, (bfd_size_type) chars);
+	      buf = bfd_realloc (buf, (bfd_size_type) chars);
 	      if (buf == NULL)
 		goto error_return;
 	      bufsize = chars;
@@ -395,7 +358,7 @@ ihex_scan (abfd)
 
 		  sprintf (secbuf, ".sec%d", bfd_count_sections (abfd) + 1);
 		  amt = strlen (secbuf) + 1;
-		  secname = (char *) bfd_alloc (abfd, amt);
+		  secname = bfd_alloc (abfd, amt);
 		  if (secname == NULL)
 		    goto error_return;
 		  strcpy (secname, secbuf);
@@ -516,10 +479,9 @@ ihex_scan (abfd)
 /* Try to recognize an Intel Hex file.  */
 
 static const bfd_target *
-ihex_object_p (abfd)
-     bfd *abfd;
+ihex_object_p (bfd *abfd)
 {
-  PTR tdata_save;
+  void * tdata_save;
   bfd_byte b[9];
   unsigned int i;
   unsigned int type;
@@ -573,10 +535,7 @@ ihex_object_p (abfd)
 /* Read the contents of a section in an Intel Hex file.  */
 
 static bfd_boolean
-ihex_read_section (abfd, section, contents)
-     bfd *abfd;
-     asection *section;
-     bfd_byte *contents;
+ihex_read_section (bfd *abfd, asection *section, bfd_byte *contents)
 {
   int c;
   bfd_byte *p;
@@ -623,7 +582,7 @@ ihex_read_section (abfd, section, contents)
 
       if (len * 2 > bufsize)
 	{
-	  buf = (bfd_byte *) bfd_realloc (buf, (bfd_size_type) len * 2);
+	  buf = bfd_realloc (buf, (bfd_size_type) len * 2);
 	  if (buf == NULL)
 	    goto error_return;
 	  bufsize = len * 2;
@@ -669,12 +628,11 @@ ihex_read_section (abfd, section, contents)
 /* Get the contents of a section in an Intel Hex file.  */
 
 static bfd_boolean
-ihex_get_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     asection *section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
+ihex_get_section_contents (bfd *abfd,
+			   asection *section,
+			   void * location,
+			   file_ptr offset,
+			   bfd_size_type count)
 {
   if (section->used_by_bfd == NULL)
     {
@@ -694,29 +652,26 @@ ihex_get_section_contents (abfd, section, location, offset, count)
 /* Set the contents of a section in an Intel Hex file.  */
 
 static bfd_boolean
-ihex_set_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     asection *section;
-     const PTR location;
-     file_ptr offset;
-     bfd_size_type count;
+ihex_set_section_contents (bfd *abfd,
+			   asection *section,
+			   const void * location,
+			   file_ptr offset,
+			   bfd_size_type count)
 {
   struct ihex_data_list *n;
   bfd_byte *data;
   struct ihex_data_struct *tdata;
-  bfd_size_type amt;
 
   if (count == 0
       || (section->flags & SEC_ALLOC) == 0
       || (section->flags & SEC_LOAD) == 0)
     return TRUE;
 
-  amt = sizeof (struct ihex_data_list);
-  n = (struct ihex_data_list *) bfd_alloc (abfd, amt);
+  n = bfd_alloc (abfd, sizeof (* n));
   if (n == NULL)
     return FALSE;
 
-  data = (bfd_byte *) bfd_alloc (abfd, count);
+  data = bfd_alloc (abfd, count);
   if (data == NULL)
     return FALSE;
   memcpy (data, location, (size_t) count);
@@ -737,7 +692,7 @@ ihex_set_section_contents (abfd, section, location, offset, count)
     }
   else
     {
-      register struct ihex_data_list **pp;
+      struct ihex_data_list **pp;
 
       for (pp = &tdata->head;
 	   *pp != NULL && (*pp)->where < n->where;
@@ -755,12 +710,11 @@ ihex_set_section_contents (abfd, section, location, offset, count)
 /* Write a record out to an Intel Hex file.  */
 
 static bfd_boolean
-ihex_write_record (abfd, count, addr, type, data)
-     bfd *abfd;
-     size_t count;
-     unsigned int addr;
-     unsigned int type;
-     bfd_byte *data;
+ihex_write_record (bfd *abfd,
+		   size_t count,
+		   unsigned int addr,
+		   unsigned int type,
+		   bfd_byte *data)
 {
   static const char digs[] = "0123456789ABCDEF";
   char buf[9 + CHUNK * 2 + 4];
@@ -800,8 +754,7 @@ ihex_write_record (abfd, count, addr, type, data)
 /* Write out an Intel Hex file.  */
 
 static bfd_boolean
-ihex_write_object_contents (abfd)
-     bfd *abfd;
+ihex_write_object_contents (bfd *abfd)
 {
   bfd_vma segbase;
   bfd_vma extbase;
@@ -818,6 +771,7 @@ ihex_write_object_contents (abfd)
       where = l->where;
       p = l->data;
       count = l->size;
+
       while (count > 0)
 	{
 	  size_t now;
@@ -931,10 +885,9 @@ ihex_write_object_contents (abfd)
    irrelevant, so we ignore errors about unknown architectures.  */
 
 static bfd_boolean
-ihex_set_arch_mach (abfd, arch, mach)
-     bfd *abfd;
-     enum bfd_architecture arch;
-     unsigned long mach;
+ihex_set_arch_mach (bfd *abfd,
+		    enum bfd_architecture arch,
+		    unsigned long mach)
 {
   if (! bfd_default_set_arch_mach (abfd, arch, mach))
     {
@@ -947,80 +900,69 @@ ihex_set_arch_mach (abfd, arch, mach)
 /* Get the size of the headers, for the linker.  */
 
 static int
-ihex_sizeof_headers (abfd, exec)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     bfd_boolean exec ATTRIBUTE_UNUSED;
+ihex_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED, bfd_boolean exec ATTRIBUTE_UNUSED)
 {
   return 0;
 }
 
 /* Some random definitions for the target vector.  */
 
-#define	ihex_close_and_cleanup _bfd_generic_close_and_cleanup
-#define ihex_bfd_free_cached_info _bfd_generic_bfd_free_cached_info
-#define ihex_new_section_hook _bfd_generic_new_section_hook
-#define ihex_get_section_contents_in_window \
-  _bfd_generic_get_section_contents_in_window
-
-#define ihex_get_symtab_upper_bound bfd_0l
-#define ihex_canonicalize_symtab \
-  ((long (*) PARAMS ((bfd *, asymbol **))) bfd_0l)
-#define ihex_make_empty_symbol _bfd_generic_make_empty_symbol
-#define ihex_print_symbol _bfd_nosymbols_print_symbol
-#define ihex_get_symbol_info _bfd_nosymbols_get_symbol_info
-#define ihex_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
-#define ihex_bfd_is_local_label_name _bfd_nosymbols_bfd_is_local_label_name
-#define ihex_get_lineno _bfd_nosymbols_get_lineno
-#define ihex_find_nearest_line _bfd_nosymbols_find_nearest_line
-#define ihex_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
-#define ihex_read_minisymbols _bfd_nosymbols_read_minisymbols
-#define ihex_minisymbol_to_symbol _bfd_nosymbols_minisymbol_to_symbol
-
-#define ihex_get_reloc_upper_bound \
-  ((long (*) PARAMS ((bfd *, asection *))) bfd_0l)
-#define ihex_canonicalize_reloc \
-  ((long (*) PARAMS ((bfd *, asection *, arelent **, asymbol **))) bfd_0l)
-#define ihex_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup
-
-#define ihex_bfd_get_relocated_section_contents \
-  bfd_generic_get_relocated_section_contents
-#define ihex_bfd_relax_section bfd_generic_relax_section
-#define ihex_bfd_gc_sections bfd_generic_gc_sections
-#define ihex_bfd_merge_sections bfd_generic_merge_sections
-#define ihex_bfd_is_group_section bfd_generic_is_group_section
-#define ihex_bfd_discard_group bfd_generic_discard_group
-#define ihex_section_already_linked \
-  _bfd_generic_section_already_linked
-#define ihex_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
-#define ihex_bfd_link_hash_table_free _bfd_generic_link_hash_table_free
-#define ihex_bfd_link_add_symbols _bfd_generic_link_add_symbols
-#define ihex_bfd_link_just_syms _bfd_generic_link_just_syms
-#define ihex_bfd_final_link _bfd_generic_final_link
-#define ihex_bfd_link_split_section _bfd_generic_link_split_section
+#define	ihex_close_and_cleanup                    _bfd_generic_close_and_cleanup
+#define ihex_bfd_free_cached_info                 _bfd_generic_bfd_free_cached_info
+#define ihex_new_section_hook                     _bfd_generic_new_section_hook
+#define ihex_get_section_contents_in_window       _bfd_generic_get_section_contents_in_window
+#define ihex_get_symtab_upper_bound               bfd_0l
+#define ihex_canonicalize_symtab                  ((long (*) (bfd *, asymbol **)) bfd_0l)
+#define ihex_make_empty_symbol                    _bfd_generic_make_empty_symbol
+#define ihex_print_symbol                         _bfd_nosymbols_print_symbol
+#define ihex_get_symbol_info                      _bfd_nosymbols_get_symbol_info
+#define ihex_bfd_is_target_special_symbol         ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#define ihex_bfd_is_local_label_name              _bfd_nosymbols_bfd_is_local_label_name
+#define ihex_get_lineno                           _bfd_nosymbols_get_lineno
+#define ihex_find_nearest_line                    _bfd_nosymbols_find_nearest_line
+#define ihex_bfd_make_debug_symbol                _bfd_nosymbols_bfd_make_debug_symbol
+#define ihex_read_minisymbols                     _bfd_nosymbols_read_minisymbols
+#define ihex_minisymbol_to_symbol                 _bfd_nosymbols_minisymbol_to_symbol
+#define ihex_get_reloc_upper_bound                ((long (*) (bfd *, asection *)) bfd_0l)
+#define ihex_canonicalize_reloc                   ((long (*) (bfd *, asection *, arelent **, asymbol **)) bfd_0l)
+#define ihex_bfd_reloc_type_lookup                _bfd_norelocs_bfd_reloc_type_lookup
+#define ihex_bfd_get_relocated_section_contents   bfd_generic_get_relocated_section_contents
+#define ihex_bfd_relax_section                    bfd_generic_relax_section
+#define ihex_bfd_gc_sections                      bfd_generic_gc_sections
+#define ihex_bfd_merge_sections                   bfd_generic_merge_sections
+#define ihex_bfd_is_group_section                 bfd_generic_is_group_section
+#define ihex_bfd_discard_group                    bfd_generic_discard_group
+#define ihex_section_already_linked               _bfd_generic_section_already_linked
+#define ihex_bfd_link_hash_table_create           _bfd_generic_link_hash_table_create
+#define ihex_bfd_link_hash_table_free             _bfd_generic_link_hash_table_free
+#define ihex_bfd_link_add_symbols                 _bfd_generic_link_add_symbols
+#define ihex_bfd_link_just_syms                   _bfd_generic_link_just_syms
+#define ihex_bfd_final_link                       _bfd_generic_final_link
+#define ihex_bfd_link_split_section               _bfd_generic_link_split_section
 
 /* The Intel Hex target vector.  */
 
 const bfd_target ihex_vec =
 {
-  "ihex",			/* name */
+  "ihex",			/* Name.  */
   bfd_target_ihex_flavour,
-  BFD_ENDIAN_UNKNOWN,		/* target byte order */
-  BFD_ENDIAN_UNKNOWN,		/* target headers byte order */
-  0,				/* object flags */
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD),	/* section flags */
-  0,				/* leading underscore */
-  ' ',				/* ar_pad_char */
-  16,				/* ar_max_namelen */
+  BFD_ENDIAN_UNKNOWN,		/* Target byte order.  */
+  BFD_ENDIAN_UNKNOWN,		/* Target headers byte order.  */
+  0,				/* Object flags.  */
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD),	/* Section flags.  */
+  0,				/* Leading underscore.  */
+  ' ',				/* 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_getb16, bfd_getb_signed_16, bfd_putb16,	/* Headers. */
 
   {
     _bfd_dummy_target,
-    ihex_object_p,		/* bfd_check_format */
+    ihex_object_p,		/* bfd_check_format.  */
     _bfd_dummy_target,
     _bfd_dummy_target,
   },
@@ -1030,7 +972,7 @@ const bfd_target ihex_vec =
     _bfd_generic_mkarchive,
     bfd_false,
   },
-  {				/* bfd_write_contents */
+  {				/* bfd_write_contents.  */
     bfd_false,
     ihex_write_object_contents,
     _bfd_write_archive_contents,
@@ -1049,5 +991,5 @@ const bfd_target ihex_vec =
 
   NULL,
 
-  (PTR) 0
+  NULL
 };