2010-12-31 Michael Snyder <msnyder@vmware.com>

	* charset.c: Comment cleanup and long line wrapping.
	* charset.h: Ditto.
	* c-lang.c: Ditto.
	* c-lang.h: Ditto.
	* coff-pe-read.c: Ditto.
	* coff-pe-read.h: Ditto.
	* coffread.c: Ditto.
	* command.h: Ditto.
	* complaints.c: Ditto.
	* complaints.h: Ditto.
	* completer.c: Ditto.
	* completer.h: Ditto.
	* corefile.c: Ditto.
	* corelow.c: Ditto.
	* core-regset.c: Ditto.
	* cp-abi.c: Ditto.
	* cp-abi.h: Ditto.
	* cp-namespace.c: Ditto.
	* cp-support.c: Ditto.
	* cp-support.h: Ditto.
	* cp-valprint.c: Ditto.
	* cp-typeprint.c: Ditto.
	* c-valprint.c: Ditto.

1 files changed, 271 insertions, 214 deletions

diff --git a/gdb/coffread.c b/gdb/coffread.c
index 3d4dd60..3494eb1 100644
--- a/gdb/coffread.c
+++ b/gdb/coffread.c
@@ -51,19 +51,20 @@ extern void _initialize_coffread (void);
 
 struct coff_symfile_info
   {
-    file_ptr min_lineno_offset;	/* Where in file lowest line#s are */
-    file_ptr max_lineno_offset;	/* 1+last byte of line#s in file */
+    file_ptr min_lineno_offset;	/* Where in file lowest line#s are.  */
+    file_ptr max_lineno_offset;	/* 1+last byte of line#s in file.  */
 
-    CORE_ADDR textaddr;		/* Addr of .text section. */
-    unsigned int textsize;	/* Size of .text section. */
+    CORE_ADDR textaddr;		/* Addr of .text section.  */
+    unsigned int textsize;	/* Size of .text section.  */
     struct stab_section_list *stabsects;	/* .stab sections.  */
-    asection *stabstrsect;	/* Section pointer for .stab section */
+    asection *stabstrsect;	/* Section pointer for .stab section.  */
     char *stabstrdata;
   };
 
 /* Translate an external name string into a user-visible name.  */
 #define	EXTERNAL_NAME(string, abfd) \
-	(string[0] == bfd_get_symbol_leading_char(abfd)? string+1: string)
+	(string[0] == bfd_get_symbol_leading_char (abfd) \
+	? string + 1 : string)
 
 /* To be an sdb debug type, type must have at least a basic or primary
    derived type.  Using this rather than checking against T_NULL is
@@ -85,7 +86,8 @@ static bfd *nlist_bfd_global;
 static int nlist_nsyms_global;
 
 
-/* Pointers to scratch storage, used for reading raw symbols and auxents.  */
+/* Pointers to scratch storage, used for reading raw symbols and
+   auxents.  */
 
 static char *temp_sym;
 static char *temp_aux;
@@ -106,10 +108,10 @@ static unsigned local_n_tshift;
 #define	N_TMASK		local_n_tmask
 #define	N_TSHIFT	local_n_tshift
 
-/* Local variables that hold the sizes in the file of various COFF structures.
-   (We only need to know this to read them from the file -- BFD will then
-   translate the data in them, into `internal_xxx' structs in the right
-   byte order, alignment, etc.)  */
+/* Local variables that hold the sizes in the file of various COFF
+   structures.  (We only need to know this to read them from the file
+   -- BFD will then translate the data in them, into `internal_xxx'
+   structs in the right byte order, alignment, etc.)  */
 
 static unsigned local_linesz;
 static unsigned local_symesz;
@@ -124,13 +126,14 @@ static int pe_file;
 
 static struct symbol *opaque_type_chain[HASHSIZE];
 
-/* Simplified internal version of coff symbol table information */
+/* Simplified internal version of coff symbol table information.  */
 
 struct coff_symbol
   {
     char *c_name;
-    int c_symnum;		/* symbol number of this entry */
-    int c_naux;			/* 0 if syment only, 1 if syment + auxent, etc */
+    int c_symnum;		/* Symbol number of this entry.  */
+    int c_naux;			/* 0 if syment only, 1 if syment +
+				   auxent, etc.  */
     CORE_ADDR c_value;
     int c_sclass;
     int c_secnum;
@@ -143,7 +146,8 @@ static struct type *coff_read_struct_type (int, int, int,
 					   struct objfile *);
 
 static struct type *decode_base_type (struct coff_symbol *,
-				      unsigned int, union internal_auxent *,
+				      unsigned int,
+				      union internal_auxent *,
 				      struct objfile *);
 
 static struct type *decode_type (struct coff_symbol *, unsigned int,
@@ -183,7 +187,8 @@ static void free_stringtab_cleanup (void *ignore);
 static int init_stringtab (bfd *, long);
 
 static void read_one_sym (struct coff_symbol *,
-			  struct internal_syment *, union internal_auxent *);
+			  struct internal_syment *,
+			  union internal_auxent *);
 
 static void coff_symtab_read (long, unsigned int, struct objfile *);
 
@@ -364,10 +369,9 @@ static void
 coff_start_symtab (char *name)
 {
   start_symtab (
-  /* We fill in the filename later.  start_symtab puts
-     this pointer into last_source_file and we put it in
-     subfiles->name, which end_symtab frees; that's why
-     it must be malloc'd.  */
+  /* We fill in the filename later.  start_symtab puts this pointer
+     into last_source_file and we put it in subfiles->name, which
+     end_symtab frees; that's why it must be malloc'd.  */
 		 xstrdup (name),
   /* We never know the directory name for COFF.  */
 		 NULL,
@@ -379,8 +383,9 @@ coff_start_symtab (char *name)
 
 /* Save the vital information from when starting to read a file,
    for use when closing off the current file.
-   NAME is the file name the symbols came from, START_ADDR is the first
-   text address for the file, and SIZE is the number of bytes of text.  */
+   NAME is the file name the symbols came from, START_ADDR is the
+   first text address for the file, and SIZE is the number of bytes of
+   text.  */
 
 static void
 complete_symtab (char *name, CORE_ADDR start_addr, unsigned int size)
@@ -392,10 +397,10 @@ complete_symtab (char *name, CORE_ADDR start_addr, unsigned int size)
   current_source_end_addr = start_addr + size;
 }
 
-/* Finish the symbol definitions for one main source file,
-   close off all the lexical contexts for that file
-   (creating struct block's for them), then make the
-   struct symtab for that file and put it in the list of all such. */
+/* Finish the symbol definitions for one main source file, close off
+   all the lexical contexts for that file (creating struct block's for
+   them), then make the struct symtab for that file and put it in the
+   list of all such.  */
 
 static void
 coff_end_symtab (struct objfile *objfile)
@@ -404,9 +409,10 @@ coff_end_symtab (struct objfile *objfile)
 
   last_source_start_addr = current_source_start_addr;
 
-  symtab = end_symtab (current_source_end_addr, objfile, SECT_OFF_TEXT (objfile));
+  symtab = end_symtab (current_source_end_addr, objfile,
+		       SECT_OFF_TEXT (objfile));
 
-  /* Reinitialize for beginning of new file. */
+  /* Reinitialize for beginning of new file.  */
   last_source_file = NULL;
 }
 
@@ -417,13 +423,14 @@ record_minimal_symbol (struct coff_symbol *cs, CORE_ADDR address,
 {
   struct bfd_section *bfd_section;
 
-  /* We don't want TDESC entry points in the minimal symbol table */
+  /* We don't want TDESC entry points in the minimal symbol table.  */
   if (cs->c_name[0] == '@')
     return NULL;
 
   bfd_section = cs_to_bfd_section (cs, objfile);
-  return prim_record_minimal_symbol_and_info (cs->c_name, address, type,
-					      section, bfd_section, objfile);
+  return prim_record_minimal_symbol_and_info (cs->c_name, address,
+					      type, section,
+					      bfd_section, objfile);
 }
 
 /* coff_symfile_init ()
@@ -433,26 +440,29 @@ record_minimal_symbol (struct coff_symbol *cs, CORE_ADDR address,
    a pointer to "private data" which we fill with cookies and other
    treats for coff_symfile_read ().
 
-   We will only be called if this is a COFF or COFF-like file.
-   BFD handles figuring out the format of the file, and code in symtab.c
+   We will only be called if this is a COFF or COFF-like file.  BFD
+   handles figuring out the format of the file, and code in symtab.c
    uses BFD's determination to vector to us.
 
-   The ultimate result is a new symtab (or, FIXME, eventually a psymtab).  */
+   The ultimate result is a new symtab (or, FIXME, eventually a
+   psymtab).  */
 
 static void
 coff_symfile_init (struct objfile *objfile)
 {
-  /* Allocate struct to keep track of stab reading. */
+  /* Allocate struct to keep track of stab reading.  */
   objfile->deprecated_sym_stab_info = (struct dbx_symfile_info *)
     xmalloc (sizeof (struct dbx_symfile_info));
 
   memset (objfile->deprecated_sym_stab_info, 0,
 	  sizeof (struct dbx_symfile_info));
 
-  /* Allocate struct to keep track of the symfile */
-  objfile->deprecated_sym_private = xmalloc (sizeof (struct coff_symfile_info));
+  /* Allocate struct to keep track of the symfile.  */
+  objfile->deprecated_sym_private
+    = xmalloc (sizeof (struct coff_symfile_info));
 
-  memset (objfile->deprecated_sym_private, 0, sizeof (struct coff_symfile_info));
+  memset (objfile->deprecated_sym_private, 0,
+	  sizeof (struct coff_symfile_info));
 
   /* COFF objects may be reordered, so set OBJF_REORDERED.  If we
      find this causes a significant slowdown in gdb then we could
@@ -462,9 +472,9 @@ coff_symfile_init (struct objfile *objfile)
   init_entry_point_info (objfile);
 }
 
-/* This function is called for every section; it finds the outer limits
-   of the line table (minimum and maximum file offset) so that the
-   mainline code can read the whole thing for efficiency.  */
+/* This function is called for every section; it finds the outer
+   limits of the line table (minimum and maximum file offset) so that
+   the mainline code can read the whole thing for efficiency.  */
 
 static void
 find_linenos (bfd *abfd, struct bfd_section *asect, void *vpinfo)
@@ -473,18 +483,18 @@ find_linenos (bfd *abfd, struct bfd_section *asect, void *vpinfo)
   int size, count;
   file_ptr offset, maxoff;
 
-/* WARNING WILL ROBINSON!  ACCESSING BFD-PRIVATE DATA HERE!  FIXME!  */
+  /* WARNING WILL ROBINSON!  ACCESSING BFD-PRIVATE DATA HERE!  FIXME!  */
   count = asect->lineno_count;
-/* End of warning */
+  /* End of warning.  */
 
   if (count == 0)
     return;
   size = count * local_linesz;
 
   info = (struct coff_symfile_info *) vpinfo;
-/* WARNING WILL ROBINSON!  ACCESSING BFD-PRIVATE DATA HERE!  FIXME!  */
+  /* WARNING WILL ROBINSON!  ACCESSING BFD-PRIVATE DATA HERE!  FIXME!  */
   offset = asect->line_filepos;
-/* End of warning */
+  /* End of warning.  */
 
   if (offset < info->min_lineno_offset || info->min_lineno_offset == 0)
     info->min_lineno_offset = offset;
@@ -519,7 +529,7 @@ coff_symfile_read (struct objfile *objfile, int symfile_flags)
   
   info = (struct coff_symfile_info *) objfile->deprecated_sym_private;
   dbxinfo = objfile->deprecated_sym_stab_info;
-  symfile_bfd = abfd;		/* Kludge for swap routines */
+  symfile_bfd = abfd;		/* Kludge for swap routines.  */
 
 /* WARNING WILL ROBINSON!  ACCESSING BFD-PRIVATE DATA HERE!  FIXME!  */
   num_symbols = bfd_get_symcount (abfd);	/* How many syms */
@@ -553,7 +563,7 @@ coff_symfile_read (struct objfile *objfile, int symfile_flags)
     strncmp (bfd_get_target (objfile->obfd), "pe", 2) == 0
     || strncmp (bfd_get_target (objfile->obfd), "epoc-pe", 7) == 0;
 
-/* End of warning */
+  /* End of warning.  */
 
   info->min_lineno_offset = 0;
   info->max_lineno_offset = 0;
@@ -599,8 +609,8 @@ coff_symfile_read (struct objfile *objfile, int symfile_flags)
 
   coff_symtab_read ((long) symtab_offset, num_symbols, objfile);
 
-  /* Install any minimal symbols that have been collected as the current
-     minimal symbols for this objfile.  */
+  /* Install any minimal symbols that have been collected as the
+     current minimal symbols for this objfile.  */
 
   install_minimal_symbols (objfile);
 
@@ -661,10 +671,11 @@ coff_new_init (struct objfile *ignore)
 {
 }
 
-/* Perform any local cleanups required when we are done with a particular
-   objfile.  I.E, we are in the process of discarding all symbol information
-   for an objfile, freeing up all memory held for it, and unlinking the
-   objfile struct from the global list of known objfiles. */
+/* Perform any local cleanups required when we are done with a
+   particular objfile.  I.E, we are in the process of discarding all
+   symbol information for an objfile, freeing up all memory held for
+   it, and unlinking the objfile struct from the global list of known
+   objfiles.  */
 
 static void
 coff_symfile_finish (struct objfile *objfile)
@@ -674,7 +685,7 @@ coff_symfile_finish (struct objfile *objfile)
       xfree (objfile->deprecated_sym_private);
     }
 
-  /* Let stabs reader clean up */
+  /* Let stabs reader clean up.  */
   stabsread_clear_cache ();
 
   dwarf2_free_objfile (objfile);
@@ -716,8 +727,8 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
   struct minimal_symbol *msym;
 
   /* Work around a stdio bug in SunOS4.1.1 (this makes me nervous....
-     it's hard to know I've really worked around it.  The fix should be
-     harmless, anyway).  The symptom of the bug is that the first
+     it's hard to know I've really worked around it.  The fix should
+     be harmless, anyway).  The symptom of the bug is that the first
      fread (in read_one_sym), will (in my example) actually get data
      from file offset 268, when the fseek was to 264 (and ftell shows
      264).  This causes all hell to break loose.  I was unable to
@@ -731,7 +742,7 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
 
   bfd_seek (objfile->obfd, 0, 0);
 
-  /* Position to read the symbol table. */
+  /* Position to read the symbol table.  */
   val = bfd_seek (objfile->obfd, (long) symtab_offset, 0);
   if (val < 0)
     perror_with_name (objfile->name);
@@ -742,7 +753,7 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
   last_source_file = NULL;
   memset (opaque_type_chain, 0, sizeof opaque_type_chain);
 
-  if (type_vector)		/* Get rid of previous one */
+  if (type_vector)		/* Get rid of previous one.  */
     xfree (type_vector);
   type_vector_length = 160;
   type_vector = (struct type **)
@@ -770,10 +781,12 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
 	     allow printing values in this symtab.  */
 	  current_subfile->language = language_minimal;
 	  complete_symtab ("_globals_", 0, 0);
-	  /* done with all files, everything from here on out is globals */
+	  /* Done with all files, everything from here on out is
+	     globals.  */
 	}
 
-      /* Special case for file with type declarations only, no text.  */
+      /* Special case for file with type declarations only, no
+	 text.  */
       if (!last_source_file && SDB_TYPE (cs->c_type)
 	  && cs->c_secnum == N_DEBUG)
 	complete_symtab (filestring, 0, 0);
@@ -781,11 +794,14 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
       /* Typedefs should not be treated as symbol definitions.  */
       if (ISFCN (cs->c_type) && cs->c_sclass != C_TPDEF)
 	{
-	  /* Record all functions -- external and static -- in minsyms. */
+	  /* Record all functions -- external and static -- in
+	     minsyms.  */
 	  int section = cs_to_section (cs, objfile);
 
-	  tmpaddr = cs->c_value + ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
-	  record_minimal_symbol (cs, tmpaddr, mst_text, section, objfile);
+	  tmpaddr = cs->c_value + ANOFFSET (objfile->section_offsets,
+					    SECT_OFF_TEXT (objfile));
+	  record_minimal_symbol (cs, tmpaddr, mst_text,
+				 section, objfile);
 
 	  fcn_line_ptr = main_aux.x_sym.x_fcnary.x_fcn.x_lnnoptr;
 	  fcn_start_addr = tmpaddr;
@@ -804,13 +820,14 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
 	case C_LINE:
 	case C_ALIAS:
 	case C_HIDDEN:
-	  complaint (&symfile_complaints, _("Bad n_sclass for symbol %s"),
+	  complaint (&symfile_complaints,
+		     _("Bad n_sclass for symbol %s"),
 		     cs->c_name);
 	  break;
 
 	case C_FILE:
-	  /* c_value field contains symnum of next .file entry in table
-	     or symnum of first global after last .file.  */
+	  /* c_value field contains symnum of next .file entry in
+	     table or symnum of first global after last .file.  */
 	  next_file_symnum = cs->c_value;
 	  if (cs->c_naux > 0)
 	    filestring = coff_getfilename (&main_aux);
@@ -827,12 +844,12 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
 	  in_source_file = 1;
 	  break;
 
-	  /* C_LABEL is used for labels and static functions.  Including
-	     it here allows gdb to see static functions when no debug
-	     info is available.  */
+	  /* C_LABEL is used for labels and static functions.
+	     Including it here allows gdb to see static functions when
+	     no debug info is available.  */
 	case C_LABEL:
-	  /* However, labels within a function can make weird backtraces,
-	     so filter them out (from phdm@macqel.be). */
+	  /* However, labels within a function can make weird
+	     backtraces, so filter them out (from phdm@macqel.be).  */
 	  if (within_function)
 	    break;
 	case C_STAT:
@@ -843,18 +860,19 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
 	    {
 	      if (strcmp (cs->c_name, ".text") == 0)
 		{
-		  /* FIXME:  don't wire in ".text" as section name
-		     or symbol name! */
-		  /* Check for in_source_file deals with case of
-		     a file with debugging symbols
-		     followed by a later file with no symbols.  */
+		  /* FIXME: don't wire in ".text" as section name or
+		     symbol name!  */
+		  /* Check for in_source_file deals with case of a
+		     file with debugging symbols followed by a later
+		     file with no symbols.  */
 		  if (in_source_file)
 		    complete_symtab (filestring,
-		    cs->c_value + ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)),
+		    cs->c_value + ANOFFSET (objfile->section_offsets,
+					    SECT_OFF_TEXT (objfile)),
 				     main_aux.x_scn.x_scnlen);
 		  in_source_file = 0;
 		}
-	      /* flush rest of '.' symbols */
+	      /* Flush rest of '.' symbols.  */
 	      break;
 	    }
 	  else if (!SDB_TYPE (cs->c_type)
@@ -870,7 +888,7 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
 	    /* At least on a 3b1, gcc generates swbeg and string labels
 	       that look like this.  Ignore them.  */
 	    break;
-	  /* fall in for static symbols that don't start with '.' */
+	  /* Fall in for static symbols that don't start with '.'  */
 	case C_THUMBEXT:
 	case C_THUMBEXTFUNC:
 	case C_EXT:
@@ -906,7 +924,7 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
  	    else if (cs->c_secnum == N_ABS)
  	      {
  		/* Use the correct minimal symbol type (and don't
- 		   relocate) for absolute values. */
+ 		   relocate) for absolute values.  */
  		ms_type = mst_abs;
  		sec = cs_to_section (cs, objfile);
  		tmpaddr = cs->c_value;
@@ -917,7 +935,7 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
 
 		sec = cs_to_section (cs, objfile);
 		tmpaddr = cs->c_value;
- 		/* Statics in a PE file also get relocated */
+ 		/* Statics in a PE file also get relocated.  */
  		if (cs->c_sclass == C_EXT
  		    || cs->c_sclass == C_THUMBEXTFUNC
  		    || cs->c_sclass == C_THUMBEXT
@@ -936,22 +954,24 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
 			 && bfd_section->flags & SEC_LOAD)
 		  {
 		    ms_type =
-		      cs->c_sclass == C_EXT || cs->c_sclass == C_THUMBEXT ?
-		      mst_data : mst_file_data;
+		      cs->c_sclass == C_EXT || cs->c_sclass == C_THUMBEXT
+		      ? mst_data : mst_file_data;
 		  }
 		else if (bfd_section->flags & SEC_ALLOC)
 		  {
 		    ms_type =
-		      cs->c_sclass == C_EXT || cs->c_sclass == C_THUMBEXT ?
-		      mst_bss : mst_file_bss;
+		      cs->c_sclass == C_EXT || cs->c_sclass == C_THUMBEXT
+		      ? mst_bss : mst_file_bss;
 		  }
 		else
 		  ms_type = mst_unknown;
 	      }
 
-	    msym = record_minimal_symbol (cs, tmpaddr, ms_type, sec, objfile);
+	    msym = record_minimal_symbol (cs, tmpaddr, ms_type,
+					  sec, objfile);
 	    if (msym)
-	      gdbarch_coff_make_msymbol_special (gdbarch, cs->c_sclass, msym);
+	      gdbarch_coff_make_msymbol_special (gdbarch,
+						 cs->c_sclass, msym);
 
 	    if (SDB_TYPE (cs->c_type))
 	      {
@@ -970,12 +990,14 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
 	    {
 	      within_function = 1;
 
-	      /* value contains address of first non-init type code */
+	      /* Value contains address of first non-init type
+		 code.  */
 	      /* main_aux.x_sym.x_misc.x_lnsz.x_lnno
-	         contains line number of '{' } */
+	         contains line number of '{' }.  */
 	      if (cs->c_naux != 1)
 		complaint (&symfile_complaints,
-			   _("`.bf' symbol %d has no aux entry"), cs->c_symnum);
+			   _("`.bf' symbol %d has no aux entry"),
+			   cs->c_symnum);
 	      fcn_first_line = main_aux.x_sym.x_misc.x_lnsz.x_lnno;
 	      fcn_first_line_addr = cs->c_value;
 
@@ -986,19 +1008,20 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
 	      new = push_context (depth, fcn_start_addr);
 	      fcn_cs_saved.c_name = getsymname (&fcn_sym_saved);
 	      new->name =
-		process_coff_symbol (&fcn_cs_saved, &fcn_aux_saved, objfile);
+		process_coff_symbol (&fcn_cs_saved, 
+				     &fcn_aux_saved, objfile);
 	    }
 	  else if (strcmp (cs->c_name, ".ef") == 0)
 	    {
 	      if (!within_function)
 		error (_("Bad coff function information."));
-	      /* the value of .ef is the address of epilogue code;
+	      /* The value of .ef is the address of epilogue code;
 	         not useful for gdb.  */
 	      /* { main_aux.x_sym.x_misc.x_lnsz.x_lnno
 	         contains number of lines to '}' */
 
 	      if (context_stack_depth <= 0)
-		{		/* We attempted to pop an empty context stack */
+		{	/* We attempted to pop an empty context stack.  */
 		  complaint (&symfile_complaints,
 			     _("`.ef' symbol without matching `.bf' symbol ignored starting at symnum %d"),
 			     cs->c_symnum);
@@ -1019,7 +1042,8 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
 	      if (cs->c_naux != 1)
 		{
 		  complaint (&symfile_complaints,
-			     _("`.ef' symbol %d has no aux entry"), cs->c_symnum);
+			     _("`.ef' symbol %d has no aux entry"),
+			     cs->c_symnum);
 		  fcn_last_line = 0x7FFFFFFF;
 		}
 	      else
@@ -1028,23 +1052,25 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
 		}
 	      /* fcn_first_line is the line number of the opening '{'.
 	         Do not record it - because it would affect gdb's idea
-	         of the line number of the first statement of the function -
-	         except for one-line functions, for which it is also the line
-	         number of all the statements and of the closing '}', and
-	         for which we do not have any other statement-line-number. */
+	         of the line number of the first statement of the
+	         function - except for one-line functions, for which
+	         it is also the line number of all the statements and
+	         of the closing '}', and for which we do not have any
+	         other statement-line-number.  */
 	      if (fcn_last_line == 1)
 		record_line (current_subfile, fcn_first_line,
 			     gdbarch_addr_bits_remove (gdbarch,
 						       fcn_first_line_addr));
 	      else
-		enter_linenos (fcn_line_ptr, fcn_first_line, fcn_last_line,
-			       objfile);
+		enter_linenos (fcn_line_ptr, fcn_first_line,
+			       fcn_last_line, objfile);
 
-	      finish_block (new->name, &local_symbols, new->old_blocks,
-			    new->start_addr,
+	      finish_block (new->name, &local_symbols,
+			    new->old_blocks, new->start_addr,
 			    fcn_cs_saved.c_value
 			    + fcn_aux_saved.x_sym.x_misc.x_fsize
-			    + ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)),
+			    + ANOFFSET (objfile->section_offsets,
+					SECT_OFF_TEXT (objfile)),
 			    objfile
 		);
 	      within_function = 0;
@@ -1055,13 +1081,14 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
 	  if (strcmp (cs->c_name, ".bb") == 0)
 	    {
 	      tmpaddr = cs->c_value;
-	      tmpaddr += ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
+	      tmpaddr += ANOFFSET (objfile->section_offsets,
+				   SECT_OFF_TEXT (objfile));
 	      push_context (++depth, tmpaddr);
 	    }
 	  else if (strcmp (cs->c_name, ".eb") == 0)
 	    {
 	      if (context_stack_depth <= 0)
-		{		/* We attempted to pop an empty context stack */
+		{	/* We attempted to pop an empty context stack. */
 		  complaint (&symfile_complaints,
 			     _("`.eb' symbol without matching `.bb' symbol ignored starting at symnum %d"),
 			     cs->c_symnum);
@@ -1071,7 +1098,7 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
 	      new = pop_context ();
 	      if (depth-- != new->depth)
 		{
-		  complaint (&symfile_complaints,
+		  complaint (&symfile_complaints, 
 			     _("Mismatched .eb symbol ignored starting at symnum %d"),
 			     symnum);
 		  break;
@@ -1079,7 +1106,8 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
 	      if (local_symbols && context_stack_depth > 0)
 		{
 		  tmpaddr =
-		    cs->c_value + ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
+		    cs->c_value + ANOFFSET (objfile->section_offsets,
+					    SECT_OFF_TEXT (objfile));
 		  /* Make a block for the local symbols within.  */
 		  finish_block (0, &local_symbols, new->old_blocks,
 				new->start_addr, tmpaddr, objfile);
@@ -1098,7 +1126,7 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
   if ((nsyms == 0) && (pe_file))
     {
       /* We've got no debugging symbols, but it's a portable
-	 executable, so try to read the export table */
+	 executable, so try to read the export table.  */
       read_pe_exported_syms (objfile);
     }
 
@@ -1115,9 +1143,10 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
 
 /* Routines for reading headers and symbols from executable.  */
 
-/* Read the next symbol, swap it, and return it in both internal_syment
-   form, and coff_symbol form.  Also return its first auxent, if any,
-   in internal_auxent form, and skip any other auxents.  */
+/* Read the next symbol, swap it, and return it in both
+   internal_syment form, and coff_symbol form.  Also return its first
+   auxent, if any, in internal_auxent form, and skip any other
+   auxents.  */
 
 static void
 read_one_sym (struct coff_symbol *cs,
@@ -1138,10 +1167,11 @@ read_one_sym (struct coff_symbol *cs,
       bytes  = bfd_bread (temp_aux, local_auxesz, nlist_bfd_global);
       if (bytes != local_auxesz)
 	error ("%s: error reading symbols", current_objfile->name);
-      bfd_coff_swap_aux_in (symfile_bfd, temp_aux, sym->n_type, sym->n_sclass,
+      bfd_coff_swap_aux_in (symfile_bfd, temp_aux,
+			    sym->n_type, sym->n_sclass,
 			    0, cs->c_naux, (char *) aux);
       /* If more than one aux entry, read past it (only the first aux
-         is important). */
+         is important).  */
       for (i = 1; i < cs->c_naux; i++)
 	{
 	  bytes = bfd_bread (temp_aux, local_auxesz, nlist_bfd_global);
@@ -1193,7 +1223,7 @@ read_one_sym (struct coff_symbol *cs,
     }
 }
 
-/* Support for string table handling */
+/* Support for string table handling.  */
 
 static char *stringtab = NULL;
 
@@ -1207,7 +1237,7 @@ init_stringtab (bfd *abfd, long offset)
   free_stringtab ();
 
   /* If the file is stripped, the offset might be zero, indicating no
-     string table.  Just return with `stringtab' set to null. */
+     string table.  Just return with `stringtab' set to null.  */
   if (offset == 0)
     return 0;
 
@@ -1218,19 +1248,19 @@ init_stringtab (bfd *abfd, long offset)
   length = bfd_h_get_32 (symfile_bfd, lengthbuf);
 
   /* If no string table is needed, then the file may end immediately
-     after the symbols.  Just return with `stringtab' set to null. */
+     after the symbols.  Just return with `stringtab' set to null.  */
   if (val != sizeof lengthbuf || length < sizeof lengthbuf)
     return 0;
 
   stringtab = (char *) xmalloc (length);
-  /* This is in target format (probably not very useful, and not currently
-     used), not host format.  */
+  /* This is in target format (probably not very useful, and not
+     currently used), not host format.  */
   memcpy (stringtab, lengthbuf, sizeof lengthbuf);
-  if (length == sizeof length)	/* Empty table -- just the count */
+  if (length == sizeof length)	/* Empty table -- just the count.  */
     return 0;
 
-  val = bfd_bread (stringtab + sizeof lengthbuf, length - sizeof lengthbuf,
-		   abfd);
+  val = bfd_bread (stringtab + sizeof lengthbuf, 
+		   length - sizeof lengthbuf, abfd);
   if (val != length - sizeof lengthbuf || stringtab[length - 1] != '\0')
     return -1;
 
@@ -1272,9 +1302,9 @@ getsymname (struct internal_syment *symbol_entry)
   return result;
 }
 
-/* Extract the file name from the aux entry of a C_FILE symbol.  Return
-   only the last component of the name.  Result is in static storage and
-   is only good for temporary use.  */
+/* Extract the file name from the aux entry of a C_FILE symbol.
+   Return only the last component of the name.  Result is in static
+   storage and is only good for temporary use.  */
 
 static char *
 coff_getfilename (union internal_auxent *aux_entry)
@@ -1326,14 +1356,14 @@ init_lineno (bfd *abfd, long offset, int size)
   if (bfd_seek (abfd, offset, 0) < 0)
     return -1;
 
-  /* Allocate the desired table, plus a sentinel */
+  /* Allocate the desired table, plus a sentinel.  */
   linetab = (char *) xmalloc (size + local_linesz);
 
   val = bfd_bread (linetab, size, abfd);
   if (val != size)
     return -1;
 
-  /* Terminate it with an all-zero sentinel record */
+  /* Terminate it with an all-zero sentinel record.  */
   memset (linetab + size, 0, local_linesz);
 
   return 0;
@@ -1372,16 +1402,17 @@ enter_linenos (long file_offset, int first_line,
       complaint (&symfile_complaints,
 		 _("Line number pointer %ld lower than start of line numbers"),
 		 file_offset);
-      if (file_offset > linetab_size)	/* Too big to be an offset? */
+      if (file_offset > linetab_size)	/* Too big to be an offset?  */
 	return;
-      file_offset += linetab_offset;	/* Try reading at that linetab offset */
+      file_offset += linetab_offset;	/* Try reading at that linetab
+					   offset.  */
     }
 
   rawptr = &linetab[file_offset - linetab_offset];
 
-  /* skip first line entry for each function */
+  /* Skip first line entry for each function.  */
   rawptr += local_linesz;
-  /* line numbers start at one for the first line of the function */
+  /* Line numbers start at one for the first line of the function.  */
   first_line--;
 
   /* If the line number table is full (e.g. 64K lines in COFF debug
@@ -1392,12 +1423,14 @@ enter_linenos (long file_offset, int first_line,
       bfd_coff_swap_lineno_in (symfile_bfd, rawptr, &lptr);
       rawptr += local_linesz;
       /* The next function, or the sentinel, will have L_LNNO32 zero;
-	 we exit. */
+	 we exit.  */
       if (L_LNNO32 (&lptr) && L_LNNO32 (&lptr) <= last_line)
 	{
 	  CORE_ADDR addr = lptr.l_addr.l_paddr;
-	  addr += ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
-	  record_line (current_subfile, first_line + L_LNNO32 (&lptr),
+	  addr += ANOFFSET (objfile->section_offsets,
+			    SECT_OFF_TEXT (objfile));
+	  record_line (current_subfile,
+		       first_line + L_LNNO32 (&lptr),
 		       gdbarch_addr_bits_remove (gdbarch, addr));
 	}
       else
@@ -1414,20 +1447,25 @@ patch_type (struct type *type, struct type *real_type)
 
   TYPE_LENGTH (target) = TYPE_LENGTH (real_target);
   TYPE_NFIELDS (target) = TYPE_NFIELDS (real_target);
-  TYPE_FIELDS (target) = (struct field *) TYPE_ALLOC (target, field_size);
+  TYPE_FIELDS (target) = (struct field *) TYPE_ALLOC (target,
+						      field_size);
 
-  memcpy (TYPE_FIELDS (target), TYPE_FIELDS (real_target), field_size);
+  memcpy (TYPE_FIELDS (target), 
+	  TYPE_FIELDS (real_target), 
+	  field_size);
 
   if (TYPE_NAME (real_target))
     {
       if (TYPE_NAME (target))
 	xfree (TYPE_NAME (target));
-      TYPE_NAME (target) = concat (TYPE_NAME (real_target), (char *)NULL);
+      TYPE_NAME (target) = concat (TYPE_NAME (real_target), 
+				   (char *) NULL);
     }
 }
 
 /* Patch up all appropriate typedef symbols in the opaque_type_chains
-   so that they can be used to print out opaque data structures properly.  */
+   so that they can be used to print out opaque data structures
+   properly.  */
 
 static void
 patch_opaque_types (struct symtab *s)
@@ -1436,7 +1474,7 @@ patch_opaque_types (struct symtab *s)
   struct dict_iterator iter;
   struct symbol *real_sym;
 
-  /* Go through the per-file symbols only */
+  /* Go through the per-file symbols only.  */
   b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), STATIC_BLOCK);
   ALL_BLOCK_SYMBOLS (b, iter, real_sym)
     {
@@ -1522,9 +1560,11 @@ process_coff_symbol (struct coff_symbol *cs,
 
   if (ISFCN (cs->c_type))
     {
-      SYMBOL_VALUE (sym) += ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
+      SYMBOL_VALUE (sym) += ANOFFSET (objfile->section_offsets,
+				      SECT_OFF_TEXT (objfile));
       SYMBOL_TYPE (sym) =
-	lookup_function_type (decode_function_type (cs, cs->c_type, aux, objfile));
+	lookup_function_type (decode_function_type (cs, cs->c_type,
+						    aux, objfile));
 
       SYMBOL_CLASS (sym) = LOC_BLOCK;
       if (cs->c_sclass == C_STAT || cs->c_sclass == C_THUMBSTAT
@@ -1552,7 +1592,8 @@ process_coff_symbol (struct coff_symbol *cs,
 	case C_EXT:
 	  SYMBOL_CLASS (sym) = LOC_STATIC;
 	  SYMBOL_VALUE_ADDRESS (sym) = (CORE_ADDR) cs->c_value;
-	  SYMBOL_VALUE_ADDRESS (sym) += ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
+	  SYMBOL_VALUE_ADDRESS (sym) += ANOFFSET (objfile->section_offsets,
+						  SECT_OFF_TEXT (objfile));
 	  add_symbol_to_list (sym, &global_symbols);
 	  break;
 
@@ -1561,15 +1602,16 @@ process_coff_symbol (struct coff_symbol *cs,
 	case C_STAT:
 	  SYMBOL_CLASS (sym) = LOC_STATIC;
 	  SYMBOL_VALUE_ADDRESS (sym) = (CORE_ADDR) cs->c_value;
-	  SYMBOL_VALUE_ADDRESS (sym) += ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
+	  SYMBOL_VALUE_ADDRESS (sym) += ANOFFSET (objfile->section_offsets,
+						  SECT_OFF_TEXT (objfile));
 	  if (within_function)
 	    {
-	      /* Static symbol of local scope */
+	      /* Static symbol of local scope.  */
 	      add_symbol_to_list (sym, &local_symbols);
 	    }
 	  else
 	    {
-	      /* Static symbol at top level of file */
+	      /* Static symbol at top level of file.  */
 	      add_symbol_to_list (sym, &file_symbols);
 	    }
 	  break;
@@ -1612,19 +1654,19 @@ process_coff_symbol (struct coff_symbol *cs,
 	      if (TYPE_CODE (SYMBOL_TYPE (sym)) == TYPE_CODE_PTR
 		  || TYPE_CODE (SYMBOL_TYPE (sym)) == TYPE_CODE_FUNC)
 		{
-		  /* If we are giving a name to a type such as "pointer to
-		     foo" or "function returning foo", we better not set
-		     the TYPE_NAME.  If the program contains "typedef char
-		     *caddr_t;", we don't want all variables of type char
-		     * to print as caddr_t.  This is not just a
-		     consequence of GDB's type management; CC and GCC (at
-		     least through version 2.4) both output variables of
-		     either type char * or caddr_t with the type
-		     refering to the C_TPDEF symbol for caddr_t.  If a future
-		     compiler cleans this up it GDB is not ready for it
-		     yet, but if it becomes ready we somehow need to
-		     disable this check (without breaking the PCC/GCC2.4
-		     case).
+		  /* If we are giving a name to a type such as
+		     "pointer to foo" or "function returning foo", we
+		     better not set the TYPE_NAME.  If the program
+		     contains "typedef char *caddr_t;", we don't want 
+		     all variables of type char * to print as caddr_t.
+		     This is not just a consequence of GDB's type
+		     management; CC and GCC (at least through version
+		     2.4) both output variables of either type char *
+		     or caddr_t with the type refering to the C_TPDEF
+		     symbol for caddr_t.  If a future compiler cleans
+		     this up it GDB is not ready for it yet, but if it
+		     becomes ready we somehow need to disable this
+		     check (without breaking the PCC/GCC2.4 case).
 
 		     Sigh.
 
@@ -1634,14 +1676,15 @@ process_coff_symbol (struct coff_symbol *cs,
 		}
 	      else
 		TYPE_NAME (SYMBOL_TYPE (sym)) =
-		  concat (SYMBOL_LINKAGE_NAME (sym), (char *)NULL);
+		  concat (SYMBOL_LINKAGE_NAME (sym), (char *) NULL);
 	    }
 
-	  /* Keep track of any type which points to empty structured type,
-	     so it can be filled from a definition from another file.  A
-	     simple forward reference (TYPE_CODE_UNDEF) is not an
-	     empty structured type, though; the forward references
-	     work themselves out via the magic of coff_lookup_type.  */
+	  /* Keep track of any type which points to empty structured
+	     type, so it can be filled from a definition from another
+	     file.  A simple forward reference (TYPE_CODE_UNDEF) is
+	     not an empty structured type, though; the forward
+	     references work themselves out via the magic of
+	     coff_lookup_type.  */
 	  if (TYPE_CODE (SYMBOL_TYPE (sym)) == TYPE_CODE_PTR
 	      && TYPE_LENGTH (TYPE_TARGET_TYPE (SYMBOL_TYPE (sym))) == 0
 	      && TYPE_CODE (TYPE_TARGET_TYPE (SYMBOL_TYPE (sym)))
@@ -1663,7 +1706,7 @@ process_coff_symbol (struct coff_symbol *cs,
 
 	  /* Some compilers try to be helpful by inventing "fake"
 	     names for anonymous enums, structures, and unions, like
-	     "~0fake" or ".0fake".  Thanks, but no thanks... */
+	     "~0fake" or ".0fake".  Thanks, but no thanks...  */
 	  if (TYPE_TAG_NAME (SYMBOL_TYPE (sym)) == 0)
 	    if (SYMBOL_LINKAGE_NAME (sym) != NULL
 		&& *SYMBOL_LINKAGE_NAME (sym) != '~'
@@ -1710,11 +1753,11 @@ decode_type (struct coff_symbol *cs, unsigned int c_type,
 	  struct type *base_type, *index_type, *range_type;
 
 	  /* Define an array type.  */
-	  /* auxent refers to array, not base type */
+	  /* auxent refers to array, not base type.  */
 	  if (aux->x_sym.x_tagndx.l == 0)
 	    cs->c_naux = 0;
 
-	  /* shift the indices down */
+	  /* Shift the indices down.  */
 	  dim = &aux->x_sym.x_fcnary.x_ary.x_dimen[0];
 	  i = 1;
 	  n = dim[0];
@@ -1725,20 +1768,21 @@ decode_type (struct coff_symbol *cs, unsigned int c_type,
 	  base_type = decode_type (cs, new_c_type, aux, objfile);
 	  index_type = objfile_type (objfile)->builtin_int;
 	  range_type =
-	    create_range_type ((struct type *) NULL, index_type, 0, n - 1);
+	    create_range_type ((struct type *) NULL, 
+			       index_type, 0, n - 1);
 	  type =
-	    create_array_type ((struct type *) NULL, base_type, range_type);
+	    create_array_type ((struct type *) NULL, 
+			       base_type, range_type);
 	}
       return type;
     }
 
-  /* Reference to existing type.  This only occurs with the
-     struct, union, and enum types.  EPI a29k coff
-     fakes us out by producing aux entries with a nonzero
-     x_tagndx for definitions of structs, unions, and enums, so we
-     have to check the c_sclass field.  SCO 3.2v4 cc gets confused
-     with pointers to pointers to defined structs, and generates
-     negative x_tagndx fields.  */
+  /* Reference to existing type.  This only occurs with the struct,
+     union, and enum types.  EPI a29k coff fakes us out by producing
+     aux entries with a nonzero x_tagndx for definitions of structs,
+     unions, and enums, so we have to check the c_sclass field.  SCO
+     3.2v4 cc gets confused with pointers to pointers to defined
+     structs, and generates negative x_tagndx fields.  */
   if (cs->c_naux > 0 && aux->x_sym.x_tagndx.l != 0)
     {
       if (cs->c_sclass != C_STRTAG
@@ -1754,7 +1798,7 @@ decode_type (struct coff_symbol *cs, unsigned int c_type,
 	  complaint (&symfile_complaints,
 		     _("Symbol table entry for %s has bad tagndx value"),
 		     cs->c_name);
-	  /* And fall through to decode_base_type... */
+	  /* And fall through to decode_base_type...  */
 	}
     }
 
@@ -1765,20 +1809,25 @@ decode_type (struct coff_symbol *cs, unsigned int c_type,
    return the type that the function returns.  */
 
 static struct type *
-decode_function_type (struct coff_symbol *cs, unsigned int c_type,
-		      union internal_auxent *aux, struct objfile *objfile)
+decode_function_type (struct coff_symbol *cs, 
+		      unsigned int c_type,
+		      union internal_auxent *aux, 
+		      struct objfile *objfile)
 {
   if (aux->x_sym.x_tagndx.l == 0)
-    cs->c_naux = 0;		/* auxent refers to function, not base type */
+    cs->c_naux = 0;	/* auxent refers to function, not base
+			   type.  */
 
   return decode_type (cs, DECREF (c_type), aux, objfile);
 }
 
-/* basic C types */
+/* Basic C types.  */
 
 static struct type *
-decode_base_type (struct coff_symbol *cs, unsigned int c_type,
-		  union internal_auxent *aux, struct objfile *objfile)
+decode_base_type (struct coff_symbol *cs, 
+		  unsigned int c_type,
+		  union internal_auxent *aux, 
+		  struct objfile *objfile)
 {
   struct gdbarch *gdbarch = get_objfile_arch (objfile);
   struct type *type;
@@ -1786,7 +1835,7 @@ decode_base_type (struct coff_symbol *cs, unsigned int c_type,
   switch (c_type)
     {
     case T_NULL:
-      /* shows up with "void (*foo)();" structure members */
+      /* Shows up with "void (*foo)();" structure members.  */
       return objfile_type (objfile)->builtin_void;
 
 #ifdef T_VOID
@@ -1824,13 +1873,13 @@ decode_base_type (struct coff_symbol *cs, unsigned int c_type,
     case T_STRUCT:
       if (cs->c_naux != 1)
 	{
-	  /* anonymous structure type */
+	  /* Anonymous structure type.  */
 	  type = coff_alloc_type (cs->c_symnum);
 	  TYPE_CODE (type) = TYPE_CODE_STRUCT;
 	  TYPE_NAME (type) = NULL;
-	  /* This used to set the tag to "<opaque>".  But I think setting it
-	     to NULL is right, and the printing code can print it as
-	     "struct {...}".  */
+	  /* This used to set the tag to "<opaque>".  But I think
+	     setting it to NULL is right, and the printing code can
+	     print it as "struct {...}".  */
 	  TYPE_TAG_NAME (type) = NULL;
 	  INIT_CPLUS_SPECIFIC (type);
 	  TYPE_LENGTH (type) = 0;
@@ -1849,12 +1898,12 @@ decode_base_type (struct coff_symbol *cs, unsigned int c_type,
     case T_UNION:
       if (cs->c_naux != 1)
 	{
-	  /* anonymous union type */
+	  /* Anonymous union type.  */
 	  type = coff_alloc_type (cs->c_symnum);
 	  TYPE_NAME (type) = NULL;
-	  /* This used to set the tag to "<opaque>".  But I think setting it
-	     to NULL is right, and the printing code can print it as
-	     "union {...}".  */
+	  /* This used to set the tag to "<opaque>".  But I think
+	     setting it to NULL is right, and the printing code can
+	     print it as "union {...}".  */
 	  TYPE_TAG_NAME (type) = NULL;
 	  INIT_CPLUS_SPECIFIC (type);
 	  TYPE_LENGTH (type) = 0;
@@ -1874,13 +1923,13 @@ decode_base_type (struct coff_symbol *cs, unsigned int c_type,
     case T_ENUM:
       if (cs->c_naux != 1)
 	{
-	  /* anonymous enum type */
+	  /* Anonymous enum type.  */
 	  type = coff_alloc_type (cs->c_symnum);
 	  TYPE_CODE (type) = TYPE_CODE_ENUM;
 	  TYPE_NAME (type) = NULL;
-	  /* This used to set the tag to "<opaque>".  But I think setting it
-	     to NULL is right, and the printing code can print it as
-	     "enum {...}".  */
+	  /* This used to set the tag to "<opaque>".  But I think
+	     setting it to NULL is right, and the printing code can
+	     print it as "enum {...}".  */
 	  TYPE_TAG_NAME (type) = NULL;
 	  TYPE_LENGTH (type) = 0;
 	  TYPE_FIELDS (type) = 0;
@@ -1896,7 +1945,7 @@ decode_base_type (struct coff_symbol *cs, unsigned int c_type,
       return type;
 
     case T_MOE:
-      /* shouldn't show up here */
+      /* Shouldn't show up here.  */
       break;
 
     case T_UCHAR:
@@ -1916,7 +1965,8 @@ decode_base_type (struct coff_symbol *cs, unsigned int c_type,
       else
 	return objfile_type (objfile)->builtin_unsigned_long;
     }
-  complaint (&symfile_complaints, _("Unexpected type for symbol %s"), cs->c_name);
+  complaint (&symfile_complaints, 
+	     _("Unexpected type for symbol %s"), cs->c_name);
   return objfile_type (objfile)->builtin_void;
 }
 
@@ -1969,10 +2019,10 @@ coff_read_struct_type (int index, int length, int lastsym,
 	  list = new;
 
 	  /* Save the data.  */
-	  list->field.name =
-	    obsavestring (name, strlen (name), &objfile->objfile_obstack);
-	  FIELD_TYPE (list->field) = decode_type (ms, ms->c_type, &sub_aux,
-						  objfile);
+	  list->field.name = obsavestring (name, strlen (name), 
+					   &objfile->objfile_obstack);
+	  FIELD_TYPE (list->field) = decode_type (ms, ms->c_type,
+						  &sub_aux, objfile);
 	  SET_FIELD_BITPOS (list->field, 8 * ms->c_value);
 	  FIELD_BITSIZE (list->field) = 0;
 	  nfields++;
@@ -1986,10 +2036,10 @@ coff_read_struct_type (int index, int length, int lastsym,
 	  list = new;
 
 	  /* Save the data.  */
-	  list->field.name =
-	    obsavestring (name, strlen (name), &objfile->objfile_obstack);
-	  FIELD_TYPE (list->field) = decode_type (ms, ms->c_type, &sub_aux,
-						  objfile);
+	  list->field.name = obsavestring (name, strlen (name), 
+					   &objfile->objfile_obstack);
+	  FIELD_TYPE (list->field) = decode_type (ms, ms->c_type,
+						  &sub_aux, objfile);
 	  SET_FIELD_BITPOS (list->field, ms->c_value);
 	  FIELD_BITSIZE (list->field) = sub_aux.x_sym.x_misc.x_lnsz.x_size;
 	  nfields++;
@@ -2124,20 +2174,27 @@ coff_read_enum_type (int index, int length, int lastsym,
   return type;
 }
 
-/* Register our ability to parse symbols for coff BFD files. */
+/* Register our ability to parse symbols for coff BFD files.  */
 
 static const struct sym_fns coff_sym_fns =
 {
   bfd_target_coff_flavour,
-  coff_new_init,		/* sym_new_init: init anything gbl to entire symtab */
-  coff_symfile_init,		/* sym_init: read initial info, setup for sym_read() */
-  coff_symfile_read,		/* sym_read: read a symbol file into symtab */
-  coff_symfile_finish,		/* sym_finish: finished with file, cleanup */
-  default_symfile_offsets,	/* sym_offsets:  xlate external to internal form */
-  default_symfile_segments,	/* sym_segments: Get segment information from
-				   a file.  */
+  coff_new_init,		/* sym_new_init: init anything gbl to
+				   entire symtab */
+  coff_symfile_init,		/* sym_init: read initial info, setup
+				   for sym_read() */
+  coff_symfile_read,		/* sym_read: read a symbol file into
+				   symtab */
+  coff_symfile_finish,		/* sym_finish: finished with file,
+				   cleanup */
+  default_symfile_offsets,	/* sym_offsets: xlate external to
+				   internal form */
+  default_symfile_segments,	/* sym_segments: Get segment
+				   information from a file */
   NULL,                         /* sym_read_linetable  */
-  default_symfile_relocate,	/* sym_relocate: Relocate a debug section.  */
+
+  default_symfile_relocate,	/* sym_relocate: Relocate a debug
+				   section.  */
   &psym_functions
 };