Convert to ISO C90 formatting

1 files changed, 163 insertions, 250 deletions

diff --git a/bfd/srec.c b/bfd/srec.c
index 93480c767f..da25a970b1 100644
--- a/bfd/srec.c
+++ b/bfd/srec.c
@@ -4,27 +4,26 @@
    Free Software Foundation, Inc.
    Written by Steve Chamberlain of Cygnus Support <sac@cygnus.com>.
 
-This file is part of BFD, the Binary File Descriptor library.
+   This file is part of BFD, the Binary File Descriptor library.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/*
-SUBSECTION
+/* SUBSECTION
 	S-Record handling
 
-DESCRIPTION
+   DESCRIPTION
 
 	Ordinary S-Records cannot hold anything but addresses and
 	data, so that's all that we implement.
@@ -44,10 +43,10 @@ DESCRIPTION
 
 	An s record looks like:
 
-EXAMPLE
+   EXAMPLE
 	S<type><length><address><data><checksum>
 
-DESCRIPTION
+   DESCRIPTION
 	Where
 	o length
 	is the number of bytes following upto the checksum. Note that
@@ -72,10 +71,10 @@ DESCRIPTION
 	is the sum of all the raw byte data in the record, from the length
 	upwards, modulo 256 and subtracted from 255.
 
-SUBSECTION
+   SUBSECTION
 	Symbol S-Record handling
 
-DESCRIPTION
+   DESCRIPTION
 	Some ICE equipment understands an addition to the standard
 	S-Record format; symbols and their addresses can be sent
 	before the data.
@@ -87,7 +86,7 @@ DESCRIPTION
 
 	so a short symbol table could look like:
 
-EXAMPLE
+   EXAMPLE
 	$$ flash.x
 	$$ flash.c
 	  _port6 $0
@@ -98,11 +97,9 @@ EXAMPLE
  	  _end $8036
 	$$
 
-DESCRIPTION
+   DESCRIPTION
 	We allow symbols to be anywhere in the data stream - the module names
-	are always ignored.
-
-*/
+	are always ignored.  */
 
 #include "bfd.h"
 #include "sysdep.h"
@@ -110,61 +107,18 @@ DESCRIPTION
 #include "libiberty.h"
 #include "safe-ctype.h"
 
-static void srec_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *));
-static void srec_print_symbol
- PARAMS ((bfd *, PTR, asymbol *, bfd_print_symbol_type));
-static void srec_init PARAMS ((void));
-static bfd_boolean srec_mkobject PARAMS ((bfd *));
-static int srec_get_byte PARAMS ((bfd *, bfd_boolean *));
-static void srec_bad_byte PARAMS ((bfd *, unsigned int, int, bfd_boolean));
-static bfd_boolean srec_scan PARAMS ((bfd *));
-static const bfd_target *srec_object_p PARAMS ((bfd *));
-static const bfd_target *symbolsrec_object_p PARAMS ((bfd *));
-static bfd_boolean srec_read_section PARAMS ((bfd *, asection *, bfd_byte *));
-
-static bfd_boolean srec_write_record
-  PARAMS ((bfd *, unsigned int, bfd_vma, const bfd_byte *, const bfd_byte *));
-static bfd_boolean srec_write_header PARAMS ((bfd *));
-static bfd_boolean srec_write_symbols PARAMS ((bfd *));
-static bfd_boolean srec_new_symbol PARAMS ((bfd *, const char *, bfd_vma));
-static bfd_boolean srec_get_section_contents
-  PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
-static bfd_boolean srec_set_arch_mach
-  PARAMS ((bfd *, enum bfd_architecture, unsigned long));
-static bfd_boolean srec_set_section_contents
-  PARAMS ((bfd *, sec_ptr, const PTR, file_ptr, bfd_size_type));
-static bfd_boolean internal_srec_write_object_contents PARAMS ((bfd *, int));
-static bfd_boolean srec_write_object_contents PARAMS ((bfd *));
-static bfd_boolean symbolsrec_write_object_contents PARAMS ((bfd *));
-static int srec_sizeof_headers PARAMS ((bfd *, bfd_boolean));
-static long srec_get_symtab_upper_bound PARAMS ((bfd *));
-static long srec_canonicalize_symtab PARAMS ((bfd *, asymbol **));
 
 /* Macros for converting between hex and binary.  */
 
 static const char digs[] = "0123456789ABCDEF";
 
-#define NIBBLE(x) hex_value(x)
-#define HEX(buffer) ((NIBBLE((buffer)[0])<<4) + NIBBLE((buffer)[1]))
+#define NIBBLE(x)    hex_value(x)
+#define HEX(buffer) ((NIBBLE ((buffer)[0])<<4) + NIBBLE ((buffer)[1]))
 #define TOHEX(d, x, ch) \
 	d[1] = digs[(x) & 0xf]; \
 	d[0] = digs[((x)>>4)&0xf]; \
 	ch += ((x) & 0xff);
-#define	ISHEX(x)  hex_p(x)
-
-/* Initialize by filling in the hex conversion array.  */
-
-static void
-srec_init ()
-{
-  static bfd_boolean inited = FALSE;
-
-  if (! inited)
-    {
-      inited = TRUE;
-      hex_init ();
-    }
-}
+#define	ISHEX(x)    hex_p(x)
 
 /* The maximum number of address+data+crc bytes on a line is FF.  */
 #define MAXCHUNK 0xff
@@ -219,24 +173,30 @@ typedef struct srec_data_struct
   }
 tdata_type;
 
-static bfd_boolean srec_write_section
-  PARAMS ((bfd *, tdata_type *, srec_data_list_type *));
-static bfd_boolean srec_write_terminator
-  PARAMS ((bfd *, tdata_type *));
+/* Initialize by filling in the hex conversion array.  */
+
+static void
+srec_init (void)
+{
+  static bfd_boolean inited = FALSE;
+
+  if (! inited)
+    {
+      inited = TRUE;
+      hex_init ();
+    }
+}
 
 /* Set up the S-record tdata information.  */
 
 static bfd_boolean
-srec_mkobject (abfd)
-     bfd *abfd;
+srec_mkobject (bfd *abfd)
 {
-  bfd_size_type amt;
   tdata_type *tdata;
 
   srec_init ();
 
-  amt = sizeof (tdata_type);
-  tdata = (tdata_type *) bfd_alloc (abfd, amt);
+  tdata = bfd_alloc (abfd, sizeof (tdata_type));
   if (tdata == NULL)
     return FALSE;
 
@@ -255,9 +215,7 @@ srec_mkobject (abfd)
    occurred.  Return EOF on error or end of file.  */
 
 static int
-srec_get_byte (abfd, errorptr)
-     bfd *abfd;
-     bfd_boolean *errorptr;
+srec_get_byte (bfd *abfd, bfd_boolean *errorptr)
 {
   bfd_byte c;
 
@@ -276,11 +234,10 @@ srec_get_byte (abfd, errorptr)
    error messages.  */
 
 static void
-srec_bad_byte (abfd, lineno, c, error)
-     bfd *abfd;
-     unsigned int lineno;
-     int c;
-     bfd_boolean error;
+srec_bad_byte (bfd *abfd,
+	       unsigned int lineno,
+	       int c,
+	       bfd_boolean error)
 {
   if (c == EOF)
     {
@@ -308,15 +265,11 @@ srec_bad_byte (abfd, lineno, c, error)
 /* Add a new symbol found in an S-record file.  */
 
 static bfd_boolean
-srec_new_symbol (abfd, name, val)
-     bfd *abfd;
-     const char *name;
-     bfd_vma val;
+srec_new_symbol (bfd *abfd, const char *name, bfd_vma val)
 {
   struct srec_symbol *n;
-  bfd_size_type amt = sizeof (struct srec_symbol);
 
-  n = (struct srec_symbol *) bfd_alloc (abfd, amt);
+  n = bfd_alloc (abfd, sizeof (* n));
   if (n == NULL)
     return FALSE;
 
@@ -339,8 +292,7 @@ srec_new_symbol (abfd, name, val)
    section for each contiguous set of bytes.  */
 
 static bfd_boolean
-srec_scan (abfd)
-     bfd *abfd;
+srec_scan (bfd *abfd)
 {
   int c;
   unsigned int lineno = 1;
@@ -385,7 +337,6 @@ srec_scan (abfd)
 	    }
 
 	  ++lineno;
-
 	  break;
 
 	case ' ':
@@ -410,7 +361,7 @@ srec_scan (abfd)
 		}
 
 	      alc = 10;
-	      symbuf = (char *) bfd_malloc (alc + 1);
+	      symbuf = bfd_malloc (alc + 1);
 	      if (symbuf == NULL)
 		goto error_return;
 
@@ -425,7 +376,7 @@ srec_scan (abfd)
 		      char *n;
 
 		      alc *= 2;
-		      n = (char *) bfd_realloc (symbuf, alc + 1);
+		      n = bfd_realloc (symbuf, alc + 1);
 		      if (n == NULL)
 			goto error_return;
 		      p = n + (p - symbuf);
@@ -523,7 +474,7 @@ srec_scan (abfd)
 	      {
 		if (buf != NULL)
 		  free (buf);
-		buf = (bfd_byte *) bfd_malloc ((bfd_size_type) bytes * 2);
+		buf = bfd_malloc ((bfd_size_type) bytes * 2);
 		if (buf == NULL)
 		  goto error_return;
 		bufsize = bytes * 2;
@@ -578,7 +529,7 @@ srec_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);
 		    strcpy (secname, secbuf);
 		    sec = bfd_make_section (abfd, secname);
 		    if (sec == NULL)
@@ -589,7 +540,6 @@ srec_scan (abfd)
 		    sec->size = bytes;
 		    sec->filepos = pos;
 		  }
-
 		break;
 
 	      case '7':
@@ -638,10 +588,9 @@ srec_scan (abfd)
 /* Check whether an existing file is an S-record file.  */
 
 static const bfd_target *
-srec_object_p (abfd)
-     bfd *abfd;
+srec_object_p (bfd *abfd)
 {
-  PTR tdata_save;
+  void * tdata_save;
   bfd_byte b[4];
 
   srec_init ();
@@ -674,10 +623,9 @@ srec_object_p (abfd)
 /* Check whether an existing file is an S-record file with symbols.  */
 
 static const bfd_target *
-symbolsrec_object_p (abfd)
-     bfd *abfd;
+symbolsrec_object_p (bfd *abfd)
 {
-  PTR tdata_save;
+  void * tdata_save;
   char b[2];
 
   srec_init ();
@@ -710,10 +658,7 @@ symbolsrec_object_p (abfd)
 /* Read in the contents of a section in an S-record file.  */
 
 static bfd_boolean
-srec_read_section (abfd, section, contents)
-     bfd *abfd;
-     asection *section;
-     bfd_byte *contents;
+srec_read_section (bfd *abfd, asection *section, bfd_byte *contents)
 {
   int c;
   bfd_size_type sofar = 0;
@@ -749,7 +694,7 @@ srec_read_section (abfd, section, contents)
 	{
 	  if (buf != NULL)
 	    free (buf);
-	  buf = (bfd_byte *) bfd_malloc ((bfd_size_type) bytes * 2);
+	  buf = bfd_malloc ((bfd_size_type) bytes * 2);
 	  if (buf == NULL)
 	    goto error_return;
 	  bufsize = bytes * 2;
@@ -827,12 +772,11 @@ srec_read_section (abfd, section, contents)
 /* Get the contents of a section in an S-record file.  */
 
 static bfd_boolean
-srec_get_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     asection *section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
+srec_get_section_contents (bfd *abfd,
+			   asection *section,
+			   void * location,
+			   file_ptr offset,
+			   bfd_size_type count)
 {
   if (section->used_by_bfd == NULL)
     {
@@ -853,34 +797,28 @@ srec_get_section_contents (abfd, section, location, offset, count)
 /* Set the architecture.  We accept an unknown architecture here.  */
 
 static bfd_boolean
-srec_set_arch_mach (abfd, arch, mach)
-     bfd *abfd;
-     enum bfd_architecture arch;
-     unsigned long mach;
+srec_set_arch_mach (bfd *abfd, enum bfd_architecture arch, unsigned long mach)
 {
-  if (arch == bfd_arch_unknown)
-    {
-      abfd->arch_info = &bfd_default_arch_struct;
-      return TRUE;
-    }
-  return bfd_default_set_arch_mach (abfd, arch, mach);
+  if (arch != bfd_arch_unknown)
+    return bfd_default_set_arch_mach (abfd, arch, mach);
+
+  abfd->arch_info = & bfd_default_arch_struct;
+  return TRUE;
 }
 
 /* We have to save up all the Srecords for a splurge before output.  */
 
 static bfd_boolean
-srec_set_section_contents (abfd, section, location, offset, bytes_to_do)
-     bfd *abfd;
-     sec_ptr section;
-     const PTR location;
-     file_ptr offset;
-     bfd_size_type bytes_to_do;
+srec_set_section_contents (bfd *abfd,
+			   sec_ptr section,
+			   const void * location,
+			   file_ptr offset,
+			   bfd_size_type bytes_to_do)
 {
   tdata_type *tdata = abfd->tdata.srec_data;
-  register srec_data_list_type *entry;
+  srec_data_list_type *entry;
 
-  entry = ((srec_data_list_type *)
-	   bfd_alloc (abfd, (bfd_size_type) sizeof (srec_data_list_type)));
+  entry = bfd_alloc (abfd, sizeof (* entry));
   if (entry == NULL)
     return FALSE;
 
@@ -890,10 +828,10 @@ srec_set_section_contents (abfd, section, location, offset, bytes_to_do)
     {
       bfd_byte *data;
 
-      data = (bfd_byte *) bfd_alloc (abfd, bytes_to_do);
+      data = bfd_alloc (abfd, bytes_to_do);
       if (data == NULL)
 	return FALSE;
-      memcpy ((PTR) data, location, (size_t) bytes_to_do);
+      memcpy ((void *) data, location, (size_t) bytes_to_do);
 
       /* Ff S3Forced is TRUE then always select S3 records,
 	 regardless of the siez of the addresses.  */
@@ -922,7 +860,7 @@ srec_set_section_contents (abfd, section, location, offset, bytes_to_do)
 	}
       else
 	{
-	  register srec_data_list_type **look;
+	  srec_data_list_type **look;
 
 	  for (look = &tdata->head;
 	       *look != NULL && (*look)->where < entry->where;
@@ -942,12 +880,11 @@ srec_set_section_contents (abfd, section, location, offset, bytes_to_do)
    here.  */
 
 static bfd_boolean
-srec_write_record (abfd, type, address, data, end)
-     bfd *abfd;
-     unsigned int type;
-     bfd_vma address;
-     const bfd_byte *data;
-     const bfd_byte *end;
+srec_write_record (bfd *abfd,
+		   unsigned int type,
+		   bfd_vma address,
+		   const bfd_byte *data,
+		   const bfd_byte *end)
 {
   char buffer[2 * MAXCHUNK + 6];
   unsigned int check_sum = 0;
@@ -998,14 +935,12 @@ srec_write_record (abfd, type, address, data, end)
   *dst++ = '\r';
   *dst++ = '\n';
   wrlen = dst - buffer;
-  if (bfd_bwrite ((PTR) buffer, wrlen, abfd) != wrlen)
-    return FALSE;
-  return TRUE;
+
+  return bfd_bwrite ((void *) buffer, wrlen, abfd) == wrlen;
 }
 
 static bfd_boolean
-srec_write_header (abfd)
-     bfd *abfd;
+srec_write_header (bfd *abfd)
 {
   unsigned int len = strlen (abfd->filename);
 
@@ -1019,10 +954,9 @@ srec_write_header (abfd)
 }
 
 static bfd_boolean
-srec_write_section (abfd, tdata, list)
-     bfd *abfd;
-     tdata_type *tdata;
-     srec_data_list_type *list;
+srec_write_section (bfd *abfd,
+		    tdata_type *tdata,
+		    srec_data_list_type *list)
 {
   unsigned int octets_written = 0;
   bfd_byte *location = list->data;
@@ -1063,17 +997,14 @@ srec_write_section (abfd, tdata, list)
 }
 
 static bfd_boolean
-srec_write_terminator (abfd, tdata)
-     bfd *abfd;
-     tdata_type *tdata;
+srec_write_terminator (bfd *abfd, tdata_type *tdata)
 {
   return srec_write_record (abfd, 10 - tdata->type,
 			    abfd->start_address, NULL, NULL);
 }
 
 static bfd_boolean
-srec_write_symbols (abfd)
-     bfd *abfd;
+srec_write_symbols (bfd *abfd)
 {
   /* Dump out the symbols of a bfd.  */
   int i;
@@ -1083,6 +1014,7 @@ srec_write_symbols (abfd)
     {
       bfd_size_type len;
       asymbol **table = bfd_get_outsymbols (abfd);
+
       len = strlen (abfd->filename);
       if (bfd_bwrite ("$$ ", (bfd_size_type) 3, abfd) != 3
 	  || bfd_bwrite (abfd->filename, len, abfd) != len
@@ -1127,9 +1059,7 @@ srec_write_symbols (abfd)
 }
 
 static bfd_boolean
-internal_srec_write_object_contents (abfd, symbols)
-     bfd *abfd;
-     int symbols;
+internal_srec_write_object_contents (bfd *abfd, int symbols)
 {
   tdata_type *tdata = abfd->tdata.srec_data;
   srec_data_list_type *list;
@@ -1156,23 +1086,20 @@ internal_srec_write_object_contents (abfd, symbols)
 }
 
 static bfd_boolean
-srec_write_object_contents (abfd)
-     bfd *abfd;
+srec_write_object_contents (bfd *abfd)
 {
   return internal_srec_write_object_contents (abfd, 0);
 }
 
 static bfd_boolean
-symbolsrec_write_object_contents (abfd)
-     bfd *abfd;
+symbolsrec_write_object_contents (bfd *abfd)
 {
   return internal_srec_write_object_contents (abfd, 1);
 }
 
 static int
-srec_sizeof_headers (abfd, exec)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     bfd_boolean exec ATTRIBUTE_UNUSED;
+srec_sizeof_headers (bfd *abfd ATTRIBUTE_UNUSED,
+		     bfd_boolean exec ATTRIBUTE_UNUSED)
 {
   return 0;
 }
@@ -1180,8 +1107,7 @@ srec_sizeof_headers (abfd, exec)
 /* Return the amount of memory needed to read the symbol table.  */
 
 static long
-srec_get_symtab_upper_bound (abfd)
-     bfd *abfd;
+srec_get_symtab_upper_bound (bfd *abfd)
 {
   return (bfd_get_symcount (abfd) + 1) * sizeof (asymbol *);
 }
@@ -1189,9 +1115,7 @@ srec_get_symtab_upper_bound (abfd)
 /* Return the symbol table.  */
 
 static long
-srec_canonicalize_symtab (abfd, alocation)
-     bfd *abfd;
-     asymbol **alocation;
+srec_canonicalize_symtab (bfd *abfd, asymbol **alocation)
 {
   bfd_size_type symcount = bfd_get_symcount (abfd);
   asymbol *csymbols;
@@ -1203,7 +1127,7 @@ srec_canonicalize_symtab (abfd, alocation)
       asymbol *c;
       struct srec_symbol *s;
 
-      csymbols = (asymbol *) bfd_alloc (abfd, symcount * sizeof (asymbol));
+      csymbols = bfd_alloc (abfd, symcount * sizeof (asymbol));
       if (csymbols == NULL && symcount != 0)
 	return 0;
       abfd->tdata.srec_data->csymbols = csymbols;
@@ -1229,98 +1153,87 @@ srec_canonicalize_symtab (abfd, alocation)
 }
 
 static void
-srec_get_symbol_info (ignore_abfd, symbol, ret)
-     bfd *ignore_abfd ATTRIBUTE_UNUSED;
-     asymbol *symbol;
-     symbol_info *ret;
+srec_get_symbol_info (bfd *ignore_abfd ATTRIBUTE_UNUSED,
+		      asymbol *symbol,
+		      symbol_info *ret)
 {
   bfd_symbol_info (symbol, ret);
 }
 
 static void
-srec_print_symbol (abfd, afile, symbol, how)
-     bfd *abfd;
-     PTR afile;
-     asymbol *symbol;
-     bfd_print_symbol_type how;
+srec_print_symbol (bfd *abfd,
+		   void * afile,
+		   asymbol *symbol,
+		   bfd_print_symbol_type how)
 {
   FILE *file = (FILE *) afile;
+
   switch (how)
     {
     case bfd_print_symbol_name:
       fprintf (file, "%s", symbol->name);
       break;
     default:
-      bfd_print_symbol_vandf (abfd, (PTR) file, symbol);
+      bfd_print_symbol_vandf (abfd, (void *) file, symbol);
       fprintf (file, " %-5s %s",
 	       symbol->section->name,
 	       symbol->name);
-
     }
 }
 
-#define	srec_close_and_cleanup _bfd_generic_close_and_cleanup
-#define srec_bfd_free_cached_info _bfd_generic_bfd_free_cached_info
-#define srec_new_section_hook _bfd_generic_new_section_hook
-
-#define srec_bfd_is_target_special_symbol ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
-#define srec_bfd_is_local_label_name bfd_generic_is_local_label_name
-#define srec_get_lineno _bfd_nosymbols_get_lineno
-#define srec_find_nearest_line _bfd_nosymbols_find_nearest_line
-#define srec_make_empty_symbol _bfd_generic_make_empty_symbol
-#define srec_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
-#define srec_read_minisymbols _bfd_generic_read_minisymbols
-#define srec_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
-
-#define srec_get_reloc_upper_bound \
-  ((long (*) PARAMS ((bfd *, asection *))) bfd_0l)
-#define srec_canonicalize_reloc \
-  ((long (*) PARAMS ((bfd *, asection *, arelent **, asymbol **))) bfd_0l)
-#define srec_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup
-
-#define srec_get_section_contents_in_window \
-  _bfd_generic_get_section_contents_in_window
-
-#define srec_bfd_get_relocated_section_contents \
-  bfd_generic_get_relocated_section_contents
-#define srec_bfd_relax_section bfd_generic_relax_section
-#define srec_bfd_gc_sections bfd_generic_gc_sections
-#define srec_bfd_merge_sections bfd_generic_merge_sections
-#define srec_bfd_is_group_section bfd_generic_is_group_section
-#define srec_bfd_discard_group bfd_generic_discard_group
-#define srec_section_already_linked \
-  _bfd_generic_section_already_linked
-#define srec_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
-#define srec_bfd_link_hash_table_free _bfd_generic_link_hash_table_free
-#define srec_bfd_link_add_symbols _bfd_generic_link_add_symbols
-#define srec_bfd_link_just_syms _bfd_generic_link_just_syms
-#define srec_bfd_final_link _bfd_generic_final_link
-#define srec_bfd_link_split_section _bfd_generic_link_split_section
+#define	srec_close_and_cleanup                    _bfd_generic_close_and_cleanup
+#define srec_bfd_free_cached_info                 _bfd_generic_bfd_free_cached_info
+#define srec_new_section_hook                     _bfd_generic_new_section_hook
+#define srec_bfd_is_target_special_symbol         ((bfd_boolean (*) (bfd *, asymbol *)) bfd_false)
+#define srec_bfd_is_local_label_name              bfd_generic_is_local_label_name
+#define srec_get_lineno                           _bfd_nosymbols_get_lineno
+#define srec_find_nearest_line                    _bfd_nosymbols_find_nearest_line
+#define srec_make_empty_symbol                    _bfd_generic_make_empty_symbol
+#define srec_bfd_make_debug_symbol                _bfd_nosymbols_bfd_make_debug_symbol
+#define srec_read_minisymbols                     _bfd_generic_read_minisymbols
+#define srec_minisymbol_to_symbol                 _bfd_generic_minisymbol_to_symbol
+#define srec_get_reloc_upper_bound                ((long (*) (bfd *, asection *)) bfd_0l)
+#define srec_canonicalize_reloc                   ((long (*) (bfd *, asection *, arelent **, asymbol **)) bfd_0l)
+#define srec_bfd_reloc_type_lookup                _bfd_norelocs_bfd_reloc_type_lookup
+#define srec_get_section_contents_in_window       _bfd_generic_get_section_contents_in_window
+#define srec_bfd_get_relocated_section_contents   bfd_generic_get_relocated_section_contents
+#define srec_bfd_relax_section                    bfd_generic_relax_section
+#define srec_bfd_gc_sections                      bfd_generic_gc_sections
+#define srec_bfd_merge_sections                   bfd_generic_merge_sections
+#define srec_bfd_is_group_section                 bfd_generic_is_group_section
+#define srec_bfd_discard_group                    bfd_generic_discard_group
+#define srec_section_already_linked               _bfd_generic_section_already_linked
+#define srec_bfd_link_hash_table_create           _bfd_generic_link_hash_table_create
+#define srec_bfd_link_hash_table_free             _bfd_generic_link_hash_table_free
+#define srec_bfd_link_add_symbols                 _bfd_generic_link_add_symbols
+#define srec_bfd_link_just_syms                   _bfd_generic_link_just_syms
+#define srec_bfd_final_link                       _bfd_generic_final_link
+#define srec_bfd_link_split_section               _bfd_generic_link_split_section
 
 const bfd_target srec_vec =
 {
-  "srec",			/* name */
+  "srec",			/* Name.  */
   bfd_target_srec_flavour,
-  BFD_ENDIAN_UNKNOWN,		/* target byte order */
-  BFD_ENDIAN_UNKNOWN,		/* target headers byte order */
-  (HAS_RELOC | EXEC_P |		/* object flags */
+  BFD_ENDIAN_UNKNOWN,		/* Target byte order.  */
+  BFD_ENDIAN_UNKNOWN,		/* Target headers byte order.  */
+  (HAS_RELOC | EXEC_P |		/* Object flags.  */
    HAS_LINENO | HAS_DEBUG |
    HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
   (SEC_CODE | SEC_DATA | SEC_ROM | SEC_HAS_CONTENTS
-   | SEC_ALLOC | SEC_LOAD | SEC_RELOC),	/* section flags */
-  0,				/* leading underscore */
-  ' ',				/* ar_pad_char */
-  16,				/* ar_max_namelen */
+   | SEC_ALLOC | SEC_LOAD | SEC_RELOC),	/* 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,	/* Hdrs.  */
 
   {
     _bfd_dummy_target,
-    srec_object_p,		/* bfd_check_format */
+    srec_object_p,		/* bfd_check_format.  */
     _bfd_dummy_target,
     _bfd_dummy_target,
   },
@@ -1330,7 +1243,7 @@ const bfd_target srec_vec =
     _bfd_generic_mkarchive,
     bfd_false,
   },
-  {				/* bfd_write_contents */
+  {				/* bfd_write_contents.  */
     bfd_false,
     srec_write_object_contents,
     _bfd_write_archive_contents,
@@ -1349,33 +1262,33 @@ const bfd_target srec_vec =
 
   NULL,
 
-  (PTR) 0
+  NULL
 };
 
 const bfd_target symbolsrec_vec =
 {
-  "symbolsrec",			/* name */
+  "symbolsrec",			/* Name.  */
   bfd_target_srec_flavour,
-  BFD_ENDIAN_UNKNOWN,		/* target byte order */
-  BFD_ENDIAN_UNKNOWN,		/* target headers byte order */
-  (HAS_RELOC | EXEC_P |		/* object flags */
+  BFD_ENDIAN_UNKNOWN,		/* Target byte order.  */
+  BFD_ENDIAN_UNKNOWN,		/* Target headers byte order.  */
+  (HAS_RELOC | EXEC_P |		/* Object flags.  */
    HAS_LINENO | HAS_DEBUG |
    HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
   (SEC_CODE | SEC_DATA | SEC_ROM | SEC_HAS_CONTENTS
-   | SEC_ALLOC | SEC_LOAD | SEC_RELOC),	/* section flags */
-  0,				/* leading underscore */
-  ' ',				/* ar_pad_char */
-  16,				/* ar_max_namelen */
+   | SEC_ALLOC | SEC_LOAD | SEC_RELOC),	/* 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,
-    symbolsrec_object_p,	/* bfd_check_format */
+    symbolsrec_object_p,	/* bfd_check_format.  */
     _bfd_dummy_target,
     _bfd_dummy_target,
   },
@@ -1385,7 +1298,7 @@ const bfd_target symbolsrec_vec =
     _bfd_generic_mkarchive,
     bfd_false,
   },
-  {				/* bfd_write_contents */
+  {				/* bfd_write_contents.  */
     bfd_false,
     symbolsrec_write_object_contents,
     _bfd_write_archive_contents,
@@ -1404,5 +1317,5 @@ const bfd_target symbolsrec_vec =
 
   NULL,
 
-  (PTR) 0
+  NULL
 };