import gdb-1999-07-07 post reformat

1 files changed, 1417 insertions, 1376 deletions

diff --git a/gdb/symtab.c b/gdb/symtab.c
index 58da789..b09ccae 100644
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -1,22 +1,23 @@
 /* Symbol table lookup for the GNU debugger, GDB.
    Copyright 1986, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 1998
-             Free Software Foundation, Inc.
+   Free Software Foundation, Inc.
 
-This file is part of GDB.
+   This file is part of GDB.
 
-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.  */
 
 #include "defs.h"
 #include "symtab.h"
@@ -46,20 +47,20 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* Prototype for one function in parser-defs.h,
    instead of including that entire file. */
 
-extern char * find_template_name_end PARAMS ((char *));
+extern char *find_template_name_end PARAMS ((char *));
 
 /* Prototypes for local functions */
 
 static int find_methods PARAMS ((struct type *, char *, struct symbol **));
 
-static void completion_list_add_name PARAMS ((char *, char *, int, char *, 
-                                              char *));
+static void completion_list_add_name PARAMS ((char *, char *, int, char *,
+					      char *));
 
-static void build_canonical_line_spec PARAMS ((struct symtab_and_line *, 
-                                               char *, char ***));
+static void build_canonical_line_spec PARAMS ((struct symtab_and_line *,
+					       char *, char ***));
 
-static struct symtabs_and_lines decode_line_2 PARAMS ((struct symbol *[], 
-                                                       int, int, char ***));
+static struct symtabs_and_lines decode_line_2 PARAMS ((struct symbol *[],
+						       int, int, char ***));
 
 static void rbreak_command PARAMS ((char *, int));
 
@@ -77,38 +78,38 @@ char *operator_chars PARAMS ((char *, char **));
 
 static int find_line_common PARAMS ((struct linetable *, int, int *));
 
-static struct partial_symbol *lookup_partial_symbol PARAMS 
-                                  ((struct partial_symtab *, const char *,
-			            int, namespace_enum));
+static struct partial_symbol *lookup_partial_symbol PARAMS
+  ((struct partial_symtab *, const char *,
+    int, namespace_enum));
 
-static struct partial_symbol *fixup_psymbol_section PARAMS ((struct 
-                                        partial_symbol *, struct objfile *));
+static struct partial_symbol *fixup_psymbol_section PARAMS ((struct
+				       partial_symbol *, struct objfile *));
 
 static struct symtab *lookup_symtab_1 PARAMS ((char *));
 
 static void cplusplus_hint PARAMS ((char *));
 
-static struct symbol *find_active_alias PARAMS ((struct symbol *sym, 
-                                                 CORE_ADDR addr));
+static struct symbol *find_active_alias PARAMS ((struct symbol * sym,
+						 CORE_ADDR addr));
 
 /* This flag is used in hppa-tdep.c, and set in hp-symtab-read.c */
 /* Signals the presence of objects compiled by HP compilers */
 int hp_som_som_object_present = 0;
 
-static void fixup_section PARAMS ((struct general_symbol_info *, 
-                                   struct objfile *));
+static void fixup_section PARAMS ((struct general_symbol_info *,
+				   struct objfile *));
 
 static int file_matches PARAMS ((char *, char **, int));
 
-static void print_symbol_info PARAMS ((namespace_enum, 
-                                       struct symtab *, struct symbol *, 
-                                       int, char *));
+static void print_symbol_info PARAMS ((namespace_enum,
+				       struct symtab *, struct symbol *,
+				       int, char *));
 
 static void print_msymbol_info PARAMS ((struct minimal_symbol *));
 
 static void symtab_symbol_info PARAMS ((char *, namespace_enum, int));
 
-static void overload_list_add_symbol PARAMS ((struct symbol *sym,
+static void overload_list_add_symbol PARAMS ((struct symbol * sym,
 					      char *oload_name));
 
 void _initialize_symtab PARAMS ((void));
@@ -153,13 +154,13 @@ lookup_symtab_1 (name)
   register char *slash;
   register struct objfile *objfile;
 
- got_symtab:
+got_symtab:
 
   /* First, search for an exact match */
 
   ALL_SYMTABS (objfile, s)
     if (STREQ (name, s->filename))
-      return s;
+    return s;
 
   slash = strchr (name, '/');
 
@@ -167,16 +168,16 @@ lookup_symtab_1 (name)
 
   if (!slash)
     ALL_SYMTABS (objfile, s)
-      {
-	char *p = s -> filename;
-	char *tail = strrchr (p, '/');
+    {
+      char *p = s->filename;
+      char *tail = strrchr (p, '/');
 
-	if (tail)
-	  p = tail + 1;
+      if (tail)
+	p = tail + 1;
 
-	if (STREQ (p, name))
-	  return s;
-      }
+      if (STREQ (p, name))
+	return s;
+    }
 
   /* Same search rules as above apply here, but now we look thru the
      psymtabs.  */
@@ -185,9 +186,9 @@ lookup_symtab_1 (name)
   if (!ps)
     return (NULL);
 
-  if (ps -> readin)
+  if (ps->readin)
     error ("Internal: readin %s pst for `%s' found when no symtab found.",
-	   ps -> filename, name);
+	   ps->filename, name);
 
   s = PSYMTAB_TO_SYMTAB (ps);
 
@@ -218,7 +219,8 @@ lookup_symtab (name)
 #endif
 
   s = lookup_symtab_1 (name);
-  if (s) return s;
+  if (s)
+    return s;
 
 #if 0
   /* This screws c-exp.y:yylex if there is both a type "tree" and a symtab
@@ -233,7 +235,8 @@ lookup_symtab (name)
   strcpy (copy, name);
   strcat (copy, ".c");
   s = lookup_symtab_1 (copy);
-  if (s) return s;
+  if (s)
+    return s;
 #endif /* 0 */
 
   /* We didn't find anything; die.  */
@@ -246,33 +249,33 @@ lookup_symtab (name)
 
 struct partial_symtab *
 lookup_partial_symtab (name)
-char *name;
+     char *name;
 {
   register struct partial_symtab *pst;
   register struct objfile *objfile;
-  
+
   ALL_PSYMTABS (objfile, pst)
-    {
-      if (STREQ (name, pst -> filename))
-	{
-	  return (pst);
-	}
-    }
+  {
+    if (STREQ (name, pst->filename))
+      {
+	return (pst);
+      }
+  }
 
   /* Now, search for a matching tail (only if name doesn't have any dirs) */
 
   if (!strchr (name, '/'))
     ALL_PSYMTABS (objfile, pst)
-      {
-	char *p = pst -> filename;
-	char *tail = strrchr (p, '/');
+    {
+      char *p = pst->filename;
+      char *tail = strrchr (p, '/');
 
-	if (tail)
-	  p = tail + 1;
+      if (tail)
+	p = tail + 1;
 
-	if (STREQ (p, name))
-	  return (pst);
-      }
+      if (STREQ (p, name))
+	return (pst);
+    }
 
   return (NULL);
 }
@@ -307,21 +310,21 @@ gdb_mangle_name (type, method_id, signature_id)
   char buf[20];
   int len = (newname == NULL ? 0 : strlen (newname));
 
-  is_full_physname_constructor = 
-    ((physname[0]=='_' && physname[1]=='_' && 
-      (isdigit(physname[2]) || physname[2]=='Q' || physname[2]=='t'))
-     || (strncmp(physname, "__ct", 4) == 0));
+  is_full_physname_constructor =
+    ((physname[0] == '_' && physname[1] == '_' &&
+      (isdigit (physname[2]) || physname[2] == 'Q' || physname[2] == 't'))
+     || (strncmp (physname, "__ct", 4) == 0));
 
   is_constructor =
-    is_full_physname_constructor || (newname && STREQ(field_name, newname));
+    is_full_physname_constructor || (newname && STREQ (field_name, newname));
 
   if (!is_destructor)
-    is_destructor = (strncmp(physname, "__dt", 4) == 0); 
+    is_destructor = (strncmp (physname, "__dt", 4) == 0);
 
   if (is_destructor || is_full_physname_constructor)
     {
-      mangled_name = (char*) xmalloc(strlen(physname)+1);
-      strcpy(mangled_name, physname);
+      mangled_name = (char *) xmalloc (strlen (physname) + 1);
+      strcpy (mangled_name, physname);
       return mangled_name;
     }
 
@@ -332,7 +335,7 @@ gdb_mangle_name (type, method_id, signature_id)
   else if (physname[0] == 't' || physname[0] == 'Q')
     {
       /* The physname for template and qualified methods already includes
-	 the class name.  */
+         the class name.  */
       sprintf (buf, "__%s%s", const_prefix, volatile_prefix);
       newname = NULL;
       len = 0;
@@ -342,9 +345,9 @@ gdb_mangle_name (type, method_id, signature_id)
       sprintf (buf, "__%s%s%d", const_prefix, volatile_prefix, len);
     }
   mangled_name_len = ((is_constructor ? 0 : strlen (field_name))
-			  + strlen (buf) + len
-			  + strlen (physname)
-			  + 1);
+		      + strlen (buf) + len
+		      + strlen (physname)
+		      + 1);
 
   /* Only needed for GNU-mangled names.  ANSI-mangled names
      work with the normal mechanisms.  */
@@ -354,7 +357,7 @@ gdb_mangle_name (type, method_id, signature_id)
       if (opname == NULL)
 	error ("No mangling for \"%s\"", field_name);
       mangled_name_len += strlen (opname);
-      mangled_name = (char *)xmalloc (mangled_name_len);
+      mangled_name = (char *) xmalloc (mangled_name_len);
 
       strncpy (mangled_name, field_name, 3);
       mangled_name[3] = '\0';
@@ -362,7 +365,7 @@ gdb_mangle_name (type, method_id, signature_id)
     }
   else
     {
-      mangled_name = (char *)xmalloc (mangled_name_len);
+      mangled_name = (char *) xmalloc (mangled_name_len);
       if (is_constructor)
 	mangled_name[0] = '\0';
       else
@@ -371,16 +374,16 @@ gdb_mangle_name (type, method_id, signature_id)
   strcat (mangled_name, buf);
   /* If the class doesn't have a name, i.e. newname NULL, then we just
      mangle it using 0 for the length of the class.  Thus it gets mangled
-     as something starting with `::' rather than `classname::'. */ 
+     as something starting with `::' rather than `classname::'. */
   if (newname != NULL)
     strcat (mangled_name, newname);
 
   strcat (mangled_name, physname);
   return (mangled_name);
 }
-
 
 
+
 /* Find which partial symtab on contains PC and SECTION.  Return 0 if none.  */
 
 struct partial_symtab *
@@ -392,48 +395,48 @@ find_pc_sect_psymtab (pc, section)
   register struct objfile *objfile;
 
   ALL_PSYMTABS (objfile, pst)
-    {
+  {
 #if defined(HPUXHPPA)
-      if (pc >= pst->textlow && pc <= pst->texthigh)
+    if (pc >= pst->textlow && pc <= pst->texthigh)
 #else
-      if (pc >= pst->textlow && pc < pst->texthigh)
+    if (pc >= pst->textlow && pc < pst->texthigh)
 #endif
-	{
-	  struct minimal_symbol *msymbol;
-	  struct partial_symtab *tpst;
-
-	  /* An objfile that has its functions reordered might have
-	     many partial symbol tables containing the PC, but
-	     we want the partial symbol table that contains the
-	     function containing the PC.  */
-	  if (!(objfile->flags & OBJF_REORDERED) &&
-	      section == 0)	/* can't validate section this way */
-	    return (pst);
-
-	  msymbol = lookup_minimal_symbol_by_pc_section (pc, section);
-	  if (msymbol == NULL)
-	    return (pst);
-
-	  for (tpst = pst; tpst != NULL; tpst = tpst->next)
-	    {
+      {
+	struct minimal_symbol *msymbol;
+	struct partial_symtab *tpst;
+
+	/* An objfile that has its functions reordered might have
+	   many partial symbol tables containing the PC, but
+	   we want the partial symbol table that contains the
+	   function containing the PC.  */
+	if (!(objfile->flags & OBJF_REORDERED) &&
+	    section == 0)	/* can't validate section this way */
+	  return (pst);
+
+	msymbol = lookup_minimal_symbol_by_pc_section (pc, section);
+	if (msymbol == NULL)
+	  return (pst);
+
+	for (tpst = pst; tpst != NULL; tpst = tpst->next)
+	  {
 #if defined(HPUXHPPA)
-	      if (pc >= tpst->textlow && pc <= tpst->texthigh)
+	    if (pc >= tpst->textlow && pc <= tpst->texthigh)
 #else
-	      if (pc >= tpst->textlow && pc < tpst->texthigh)
+	    if (pc >= tpst->textlow && pc < tpst->texthigh)
 #endif
-		{
-		  struct partial_symbol *p;
+	      {
+		struct partial_symbol *p;
 
-		  p = find_pc_sect_psymbol (tpst, pc, section);
-		  if (p != NULL
-		      && SYMBOL_VALUE_ADDRESS(p)
-			 == SYMBOL_VALUE_ADDRESS (msymbol))
-		    return (tpst);
-		}
-	    }
-	  return (pst);
-	}
-    }
+		p = find_pc_sect_psymbol (tpst, pc, section);
+		if (p != NULL
+		    && SYMBOL_VALUE_ADDRESS (p)
+		    == SYMBOL_VALUE_ADDRESS (msymbol))
+		  return (tpst);
+	      }
+	  }
+	return (pst);
+      }
+  }
   return (NULL);
 }
 
@@ -458,7 +461,7 @@ find_pc_sect_psymbol (psymtab, pc, section)
 {
   struct partial_symbol *best = NULL, *p, **pp;
   CORE_ADDR best_pc;
-  
+
   if (!psymtab)
     psymtab = find_pc_sect_psymtab (pc, section);
   if (!psymtab)
@@ -471,8 +474,8 @@ find_pc_sect_psymbol (psymtab, pc, section)
      find_pc_partial_function doesn't use a minimal symbol and thus
      cache a bad endaddr.  */
   for (pp = psymtab->objfile->global_psymbols.list + psymtab->globals_offset;
-       (pp - (psymtab->objfile->global_psymbols.list + psymtab->globals_offset)
-	< psymtab->n_global_syms);
+    (pp - (psymtab->objfile->global_psymbols.list + psymtab->globals_offset)
+     < psymtab->n_global_syms);
        pp++)
     {
       p = *pp;
@@ -483,7 +486,7 @@ find_pc_sect_psymbol (psymtab, pc, section)
 	      || (psymtab->textlow == 0
 		  && best_pc == 0 && SYMBOL_VALUE_ADDRESS (p) == 0)))
 	{
-	  if (section)	/* match on a specific section */
+	  if (section)		/* match on a specific section */
 	    {
 	      fixup_psymbol_section (p, psymtab->objfile);
 	      if (SYMBOL_BFD_SECTION (p) != section)
@@ -495,8 +498,8 @@ find_pc_sect_psymbol (psymtab, pc, section)
     }
 
   for (pp = psymtab->objfile->static_psymbols.list + psymtab->statics_offset;
-       (pp - (psymtab->objfile->static_psymbols.list + psymtab->statics_offset)
-	< psymtab->n_static_syms);
+    (pp - (psymtab->objfile->static_psymbols.list + psymtab->statics_offset)
+     < psymtab->n_static_syms);
        pp++)
     {
       p = *pp;
@@ -504,10 +507,10 @@ find_pc_sect_psymbol (psymtab, pc, section)
 	  && SYMBOL_CLASS (p) == LOC_BLOCK
 	  && pc >= SYMBOL_VALUE_ADDRESS (p)
 	  && (SYMBOL_VALUE_ADDRESS (p) > best_pc
-	      || (psymtab->textlow == 0 
+	      || (psymtab->textlow == 0
 		  && best_pc == 0 && SYMBOL_VALUE_ADDRESS (p) == 0)))
 	{
-	  if (section)	/* match on a specific section */
+	  if (section)		/* match on a specific section */
 	    {
 	      fixup_psymbol_section (p, psymtab->objfile);
 	      if (SYMBOL_BFD_SECTION (p) != section)
@@ -621,22 +624,22 @@ lookup_symbol (name, block, namespace, is_a_field_of_this, symtab)
   while (block != 0)
     {
       sym = lookup_block_symbol (block, name, namespace);
-      if (sym) 
+      if (sym)
 	{
 	  block_found = block;
 	  if (symtab != NULL)
 	    {
 	      /* Search the list of symtabs for one which contains the
-		 address of the start of this block.  */
+	         address of the start of this block.  */
 	      ALL_SYMTABS (objfile, s)
-		{
-		  bv = BLOCKVECTOR (s);
-		  b = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
-		  if (BLOCK_START (b) <= BLOCK_START (block)
-		      && BLOCK_END (b) > BLOCK_START (block))
-		    goto found;
-		}
-found:
+	      {
+		bv = BLOCKVECTOR (s);
+		b = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
+		if (BLOCK_START (b) <= BLOCK_START (block)
+		    && BLOCK_END (b) > BLOCK_START (block))
+		  goto found;
+	      }
+	    found:
 	      *symtab = s;
 	    }
 
@@ -667,22 +670,22 @@ found:
       struct block *b;
       /* Find the right symtab.  */
       ALL_SYMTABS (objfile, s)
-	{
-	  bv = BLOCKVECTOR (s);
-	  b = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
-	  if (BLOCK_START (b) <= BLOCK_START (block)
-	      && BLOCK_END (b) > BLOCK_START (block))
-	    {
-	      sym = lookup_block_symbol (b, name, VAR_NAMESPACE);
-	      if (sym)
-		{
-		  block_found = b;
-		  if (symtab != NULL)
-		    *symtab = s;
-		  return fixup_symbol_section (sym, objfile);
-		}
-	    }
-	}
+      {
+	bv = BLOCKVECTOR (s);
+	b = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
+	if (BLOCK_START (b) <= BLOCK_START (block)
+	    && BLOCK_END (b) > BLOCK_START (block))
+	  {
+	    sym = lookup_block_symbol (b, name, VAR_NAMESPACE);
+	    if (sym)
+	      {
+		block_found = b;
+		if (symtab != NULL)
+		  *symtab = s;
+		return fixup_symbol_section (sym, objfile);
+	      }
+	  }
+      }
     }
 
 
@@ -691,7 +694,7 @@ found:
   if (is_a_field_of_this)
     {
       struct value *v = value_of_this (0);
-      
+
       *is_a_field_of_this = 0;
       if (v && check_field (v, name))
 	{
@@ -706,34 +709,34 @@ found:
      check the psymtab's. If a psymtab indicates the existence
      of the desired name as a global, then do psymtab-to-symtab
      conversion on the fly and return the found symbol. */
-  
+
   ALL_SYMTABS (objfile, s)
-    {
-      bv = BLOCKVECTOR (s);
-      block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
-      sym = lookup_block_symbol (block, name, namespace);
-      if (sym) 
-	{
-	  block_found = block;
-	  if (symtab != NULL)
-	    *symtab = s;
-	  return fixup_symbol_section (sym, objfile);
-	}
-    }
+  {
+    bv = BLOCKVECTOR (s);
+    block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
+    sym = lookup_block_symbol (block, name, namespace);
+    if (sym)
+      {
+	block_found = block;
+	if (symtab != NULL)
+	  *symtab = s;
+	return fixup_symbol_section (sym, objfile);
+      }
+  }
 
 #ifndef HPUXHPPA
 
   /* Check for the possibility of the symbol being a function or
      a mangled variable that is stored in one of the minimal symbol tables.
      Eventually, all global symbols might be resolved in this way.  */
-  
+
   if (namespace == VAR_NAMESPACE)
     {
       msymbol = lookup_minimal_symbol (name, NULL, NULL);
       if (msymbol != NULL)
 	{
 	  s = find_pc_sect_symtab (SYMBOL_VALUE_ADDRESS (msymbol),
-				  SYMBOL_BFD_SECTION (msymbol));
+				   SYMBOL_BFD_SECTION (msymbol));
 	  if (s != NULL)
 	    {
 	      /* This is a function which has a symtab for its address.  */
@@ -741,26 +744,27 @@ found:
 	      block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
 	      sym = lookup_block_symbol (block, SYMBOL_NAME (msymbol),
 					 namespace);
-              /* We kept static functions in minimal symbol table as well as
-		 in static scope. We want to find them in the symbol table. */
-		if (!sym) {
+	      /* We kept static functions in minimal symbol table as well as
+	         in static scope. We want to find them in the symbol table. */
+	      if (!sym)
+		{
 		  block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
 		  sym = lookup_block_symbol (block, SYMBOL_NAME (msymbol),
 					     namespace);
 		}
 
 	      /* sym == 0 if symbol was found in the minimal symbol table
-		 but not in the symtab.
-		 Return 0 to use the msymbol definition of "foo_".
+	         but not in the symtab.
+	         Return 0 to use the msymbol definition of "foo_".
 
-		 This happens for Fortran  "foo_" symbols,
-		 which are "foo" in the symtab.
+	         This happens for Fortran  "foo_" symbols,
+	         which are "foo" in the symtab.
 
-		 This can also happen if "asm" is used to make a
-		 regular symbol but not a debugging symbol, e.g.
-		 asm(".globl _main");
-		 asm("_main:");
-		 */
+	         This can also happen if "asm" is used to make a
+	         regular symbol but not a debugging symbol, e.g.
+	         asm(".globl _main");
+	         asm("_main:");
+	       */
 
 	      if (symtab != NULL)
 		*symtab = s;
@@ -771,8 +775,8 @@ found:
 		   && !STREQ (name, SYMBOL_NAME (msymbol)))
 	    {
 	      /* This is a mangled variable, look it up by its
-		 mangled name.  */
-	      return lookup_symbol (SYMBOL_NAME (msymbol), block, 
+	         mangled name.  */
+	      return lookup_symbol (SYMBOL_NAME (msymbol), block,
 				    namespace, is_a_field_of_this, symtab);
 	    }
 	  /* There are no debug symbols for this file, or we are looking
@@ -780,37 +784,37 @@ found:
 	     Try to find a matching static symbol below. */
 	}
     }
-      
+
 #endif
 
   ALL_PSYMTABS (objfile, ps)
-    {
-      if (!ps->readin && lookup_partial_symbol (ps, name, 1, namespace))
-	{
-	  s = PSYMTAB_TO_SYMTAB(ps);
-	  bv = BLOCKVECTOR (s);
-	  block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
-	  sym = lookup_block_symbol (block, name, namespace);
-	  if (!sym)
-            {
-              /* This shouldn't be necessary, but as a last resort
-               * try looking in the statics even though the psymtab
-               * claimed the symbol was global. It's possible that
-               * the psymtab gets it wrong in some cases.
-               */
-	      block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
-	      sym = lookup_block_symbol (block, name, namespace);
-              if (!sym)
-	        error ("Internal: global symbol `%s' found in %s psymtab but not in symtab.\n\
+  {
+    if (!ps->readin && lookup_partial_symbol (ps, name, 1, namespace))
+      {
+	s = PSYMTAB_TO_SYMTAB (ps);
+	bv = BLOCKVECTOR (s);
+	block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
+	sym = lookup_block_symbol (block, name, namespace);
+	if (!sym)
+	  {
+	    /* This shouldn't be necessary, but as a last resort
+	     * try looking in the statics even though the psymtab
+	     * claimed the symbol was global. It's possible that
+	     * the psymtab gets it wrong in some cases.
+	     */
+	    block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
+	    sym = lookup_block_symbol (block, name, namespace);
+	    if (!sym)
+	      error ("Internal: global symbol `%s' found in %s psymtab but not in symtab.\n\
 %s may be an inlined function, or may be a template function\n\
 (if a template, try specifying an instantiation: %s<type>).",
-                       name, ps->filename, name, name);
-            }
-	  if (symtab != NULL)
-	    *symtab = s;
-	  return fixup_symbol_section (sym, objfile);
-	}
-    }
+		     name, ps->filename, name, name);
+	  }
+	if (symtab != NULL)
+	  *symtab = s;
+	return fixup_symbol_section (sym, objfile);
+      }
+  }
 
   /* Now search all static file-level symbols.
      Not strictly correct, but more useful than an error.
@@ -820,47 +824,47 @@ found:
      conversion on the fly and return the found symbol. */
 
   ALL_SYMTABS (objfile, s)
-    {
-      bv = BLOCKVECTOR (s);
-      block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
-      sym = lookup_block_symbol (block, name, namespace);
-      if (sym) 
-	{
-	  block_found = block;
-	  if (symtab != NULL)
-	    *symtab = s;
-	  return fixup_symbol_section (sym, objfile);
-	}
-    }
+  {
+    bv = BLOCKVECTOR (s);
+    block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
+    sym = lookup_block_symbol (block, name, namespace);
+    if (sym)
+      {
+	block_found = block;
+	if (symtab != NULL)
+	  *symtab = s;
+	return fixup_symbol_section (sym, objfile);
+      }
+  }
 
   ALL_PSYMTABS (objfile, ps)
-    {
-      if (!ps->readin && lookup_partial_symbol (ps, name, 0, namespace))
-	{
-	  s = PSYMTAB_TO_SYMTAB(ps);
-	  bv = BLOCKVECTOR (s);
-	  block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
-	  sym = lookup_block_symbol (block, name, namespace);
-	  if (!sym)
-            {
-              /* This shouldn't be necessary, but as a last resort
-               * try looking in the globals even though the psymtab
-               * claimed the symbol was static. It's possible that
-               * the psymtab gets it wrong in some cases.
-               */
-	      block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
-	      sym = lookup_block_symbol (block, name, namespace);
-              if (!sym)
-                error ("Internal: static symbol `%s' found in %s psymtab but not in symtab.\n\
+  {
+    if (!ps->readin && lookup_partial_symbol (ps, name, 0, namespace))
+      {
+	s = PSYMTAB_TO_SYMTAB (ps);
+	bv = BLOCKVECTOR (s);
+	block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
+	sym = lookup_block_symbol (block, name, namespace);
+	if (!sym)
+	  {
+	    /* This shouldn't be necessary, but as a last resort
+	     * try looking in the globals even though the psymtab
+	     * claimed the symbol was static. It's possible that
+	     * the psymtab gets it wrong in some cases.
+	     */
+	    block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
+	    sym = lookup_block_symbol (block, name, namespace);
+	    if (!sym)
+	      error ("Internal: static symbol `%s' found in %s psymtab but not in symtab.\n\
 %s may be an inlined function, or may be a template function\n\
 (if a template, try specifying an instantiation: %s<type>).",
-                       name, ps->filename, name, name);
-            }
-	  if (symtab != NULL)
-	    *symtab = s;
-	  return fixup_symbol_section (sym, objfile);
-	}
-    }
+		     name, ps->filename, name, name);
+	  }
+	if (symtab != NULL)
+	  *symtab = s;
+	return fixup_symbol_section (sym, objfile);
+      }
+  }
 
 #ifdef HPUXHPPA
 
@@ -878,28 +882,28 @@ found:
      though... is it saying we need to do the "minsym" check before
      the static check in this case? 
    */
-  
+
   if (namespace == VAR_NAMESPACE)
     {
       msymbol = lookup_minimal_symbol (name, NULL, NULL);
       if (msymbol != NULL)
 	{
-          /* OK, we found a minimal symbol in spite of not
-           * finding any symbol. There are various possible
-           * explanations for this. One possibility is the symbol
-           * exists in code not compiled -g. Another possibility
-           * is that the 'psymtab' isn't doing its job.
-           * A third possibility, related to #2, is that we were confused 
-           * by name-mangling. For instance, maybe the psymtab isn't
-           * doing its job because it only know about demangled
-           * names, but we were given a mangled name...
-           */
-
-          /* We first use the address in the msymbol to try to
-           * locate the appropriate symtab. Note that find_pc_symtab()
-           * has a side-effect of doing psymtab-to-symtab expansion,
-           * for the found symtab.
-           */
+	  /* OK, we found a minimal symbol in spite of not
+	   * finding any symbol. There are various possible
+	   * explanations for this. One possibility is the symbol
+	   * exists in code not compiled -g. Another possibility
+	   * is that the 'psymtab' isn't doing its job.
+	   * A third possibility, related to #2, is that we were confused 
+	   * by name-mangling. For instance, maybe the psymtab isn't
+	   * doing its job because it only know about demangled
+	   * names, but we were given a mangled name...
+	   */
+
+	  /* We first use the address in the msymbol to try to
+	   * locate the appropriate symtab. Note that find_pc_symtab()
+	   * has a side-effect of doing psymtab-to-symtab expansion,
+	   * for the found symtab.
+	   */
 	  s = find_pc_symtab (SYMBOL_VALUE_ADDRESS (msymbol));
 	  if (s != NULL)
 	    {
@@ -907,44 +911,45 @@ found:
 	      block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
 	      sym = lookup_block_symbol (block, SYMBOL_NAME (msymbol),
 					 namespace);
-              /* We kept static functions in minimal symbol table as well as
-		 in static scope. We want to find them in the symbol table. */
- 	      if (!sym) 
-                {
+	      /* We kept static functions in minimal symbol table as well as
+	         in static scope. We want to find them in the symbol table. */
+	      if (!sym)
+		{
 		  block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
 		  sym = lookup_block_symbol (block, SYMBOL_NAME (msymbol),
 					     namespace);
 		}
-              /* If we found one, return it */
-              if (sym) {
-	        if (symtab != NULL)
-	          *symtab = s;
-	        return sym;
-              }
+	      /* If we found one, return it */
+	      if (sym)
+		{
+		  if (symtab != NULL)
+		    *symtab = s;
+		  return sym;
+		}
 
 	      /* If we get here with sym == 0, the symbol was 
-                 found in the minimal symbol table
-		 but not in the symtab.
-		 Fall through and return 0 to use the msymbol 
-                 definition of "foo_".
-                 (Note that outer code generally follows up a call
-                  to this routine with a call to lookup_minimal_symbol(),
-                  so a 0 return means we'll just flow into that other routine).
-
-		 This happens for Fortran  "foo_" symbols,
-		 which are "foo" in the symtab.
-
-		 This can also happen if "asm" is used to make a
-		 regular symbol but not a debugging symbol, e.g.
-		 asm(".globl _main");
-		 asm("_main:");
-		 */
+	         found in the minimal symbol table
+	         but not in the symtab.
+	         Fall through and return 0 to use the msymbol 
+	         definition of "foo_".
+	         (Note that outer code generally follows up a call
+	         to this routine with a call to lookup_minimal_symbol(),
+	         so a 0 return means we'll just flow into that other routine).
+
+	         This happens for Fortran  "foo_" symbols,
+	         which are "foo" in the symtab.
+
+	         This can also happen if "asm" is used to make a
+	         regular symbol but not a debugging symbol, e.g.
+	         asm(".globl _main");
+	         asm("_main:");
+	       */
 	    }
 
-          /* If the lookup-by-address fails, try repeating the
-           * entire lookup process with the symbol name from
-           * the msymbol (if different from the original symbol name).
-           */
+	  /* If the lookup-by-address fails, try repeating the
+	   * entire lookup process with the symbol name from
+	   * the msymbol (if different from the original symbol name).
+	   */
 	  else if (MSYMBOL_TYPE (msymbol) != mst_text
 		   && MSYMBOL_TYPE (msymbol) != mst_file_text
 		   && !STREQ (name, SYMBOL_NAME (msymbol)))
@@ -981,19 +986,19 @@ lookup_partial_symbol (pst, name, global, namespace)
     {
       return (NULL);
     }
-  
+
   start = (global ?
 	   pst->objfile->global_psymbols.list + pst->globals_offset :
-	   pst->objfile->static_psymbols.list + pst->statics_offset  );
+	   pst->objfile->static_psymbols.list + pst->statics_offset);
 
-  if (global)		/* This means we can use a binary search. */
+  if (global)			/* This means we can use a binary search. */
     {
       do_linear_search = 0;
 
       /* Binary search.  This search is guaranteed to end with center
          pointing at the earliest partial symbol with the correct
-	 name.  At that point *all* partial symbols with that name
-	 will be checked against the correct namespace. */
+         name.  At that point *all* partial symbols with that name
+         will be checked against the correct namespace. */
 
       bottom = start;
       top = start + length - 1;
@@ -1005,7 +1010,7 @@ lookup_partial_symbol (pst, name, global, namespace)
 	  if (!do_linear_search
 	      && (SYMBOL_LANGUAGE (*center) == language_cplus
 		  || SYMBOL_LANGUAGE (*center) == language_java
-		  ))
+	      ))
 	    {
 	      do_linear_search = 1;
 	    }
@@ -1026,7 +1031,7 @@ lookup_partial_symbol (pst, name, global, namespace)
 	    {
 	      return (*top);
 	    }
-	  top ++;
+	  top++;
 	}
     }
 
@@ -1074,45 +1079,45 @@ lookup_transparent_type (name)
      check the psymtab's. If a psymtab indicates the existence
      of the desired name as a global, then do psymtab-to-symtab
      conversion on the fly and return the found symbol.  */
-  
+
   ALL_SYMTABS (objfile, s)
-    {
-      bv = BLOCKVECTOR (s);
-      block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
-      sym = lookup_block_symbol (block, name, STRUCT_NAMESPACE);
-      if (sym && !TYPE_IS_OPAQUE (SYMBOL_TYPE (sym)))
-	{
-	  return SYMBOL_TYPE (sym);
-	}
-    }
+  {
+    bv = BLOCKVECTOR (s);
+    block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
+    sym = lookup_block_symbol (block, name, STRUCT_NAMESPACE);
+    if (sym && !TYPE_IS_OPAQUE (SYMBOL_TYPE (sym)))
+      {
+	return SYMBOL_TYPE (sym);
+      }
+  }
 
   ALL_PSYMTABS (objfile, ps)
-    {
-      if (!ps->readin && lookup_partial_symbol (ps, name, 1, STRUCT_NAMESPACE))
-	{
-	  s = PSYMTAB_TO_SYMTAB(ps);
-	  bv = BLOCKVECTOR (s);
-	  block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
-	  sym = lookup_block_symbol (block, name, STRUCT_NAMESPACE);
-	  if (!sym) 
-            {
-              /* This shouldn't be necessary, but as a last resort
-               * try looking in the statics even though the psymtab
-               * claimed the symbol was global. It's possible that
-               * the psymtab gets it wrong in some cases.
-               */
-	      block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
-	      sym = lookup_block_symbol (block, name, STRUCT_NAMESPACE);
-              if (!sym)
-                error ("Internal: global symbol `%s' found in %s psymtab but not in symtab.\n\
+  {
+    if (!ps->readin && lookup_partial_symbol (ps, name, 1, STRUCT_NAMESPACE))
+      {
+	s = PSYMTAB_TO_SYMTAB (ps);
+	bv = BLOCKVECTOR (s);
+	block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
+	sym = lookup_block_symbol (block, name, STRUCT_NAMESPACE);
+	if (!sym)
+	  {
+	    /* This shouldn't be necessary, but as a last resort
+	     * try looking in the statics even though the psymtab
+	     * claimed the symbol was global. It's possible that
+	     * the psymtab gets it wrong in some cases.
+	     */
+	    block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
+	    sym = lookup_block_symbol (block, name, STRUCT_NAMESPACE);
+	    if (!sym)
+	      error ("Internal: global symbol `%s' found in %s psymtab but not in symtab.\n\
 %s may be an inlined function, or may be a template function\n\
 (if a template, try specifying an instantiation: %s<type>).",
-                       name, ps->filename, name, name);
-            }
-          if (!TYPE_IS_OPAQUE (SYMBOL_TYPE (sym)))
-            return SYMBOL_TYPE (sym);
-	}
-    }
+		     name, ps->filename, name, name);
+	  }
+	if (!TYPE_IS_OPAQUE (SYMBOL_TYPE (sym)))
+	  return SYMBOL_TYPE (sym);
+      }
+  }
 
   /* Now search the static file-level symbols.
      Not strictly correct, but more useful than an error.
@@ -1123,43 +1128,43 @@ lookup_transparent_type (name)
    */
 
   ALL_SYMTABS (objfile, s)
-    {
-      bv = BLOCKVECTOR (s);
-      block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
-      sym = lookup_block_symbol (block, name, STRUCT_NAMESPACE);
-      if (sym && !TYPE_IS_OPAQUE (SYMBOL_TYPE (sym)))
-	{
-	  return SYMBOL_TYPE (sym);
-	}
-    }
+  {
+    bv = BLOCKVECTOR (s);
+    block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
+    sym = lookup_block_symbol (block, name, STRUCT_NAMESPACE);
+    if (sym && !TYPE_IS_OPAQUE (SYMBOL_TYPE (sym)))
+      {
+	return SYMBOL_TYPE (sym);
+      }
+  }
 
   ALL_PSYMTABS (objfile, ps)
-    {
-      if (!ps->readin && lookup_partial_symbol (ps, name, 0, STRUCT_NAMESPACE))
-	{
-	  s = PSYMTAB_TO_SYMTAB(ps);
-	  bv = BLOCKVECTOR (s);
-	  block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
-	  sym = lookup_block_symbol (block, name, STRUCT_NAMESPACE);
-	  if (!sym)
-            {
-              /* This shouldn't be necessary, but as a last resort
-               * try looking in the globals even though the psymtab
-               * claimed the symbol was static. It's possible that
-               * the psymtab gets it wrong in some cases.
-               */
-	      block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
-	      sym = lookup_block_symbol (block, name, STRUCT_NAMESPACE);
-              if (!sym)
-	        error ("Internal: static symbol `%s' found in %s psymtab but not in symtab.\n\
+  {
+    if (!ps->readin && lookup_partial_symbol (ps, name, 0, STRUCT_NAMESPACE))
+      {
+	s = PSYMTAB_TO_SYMTAB (ps);
+	bv = BLOCKVECTOR (s);
+	block = BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK);
+	sym = lookup_block_symbol (block, name, STRUCT_NAMESPACE);
+	if (!sym)
+	  {
+	    /* This shouldn't be necessary, but as a last resort
+	     * try looking in the globals even though the psymtab
+	     * claimed the symbol was static. It's possible that
+	     * the psymtab gets it wrong in some cases.
+	     */
+	    block = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
+	    sym = lookup_block_symbol (block, name, STRUCT_NAMESPACE);
+	    if (!sym)
+	      error ("Internal: static symbol `%s' found in %s psymtab but not in symtab.\n\
 %s may be an inlined function, or may be a template function\n\
 (if a template, try specifying an instantiation: %s<type>).",
-                       name, ps->filename, name, name);
-            }
-          if (!TYPE_IS_OPAQUE (SYMBOL_TYPE (sym)))
-            return SYMBOL_TYPE (sym);
-	}
-    }
+		     name, ps->filename, name, name);
+	  }
+	if (!TYPE_IS_OPAQUE (SYMBOL_TYPE (sym)))
+	  return SYMBOL_TYPE (sym);
+      }
+  }
   return (struct type *) 0;
 }
 
@@ -1175,12 +1180,12 @@ find_main_psymtab ()
   register struct objfile *objfile;
 
   ALL_PSYMTABS (objfile, pst)
-    {
-      if (lookup_partial_symbol (pst, "main", 1, VAR_NAMESPACE))
-	{
-	  return (pst);
-	}
-    }
+  {
+    if (lookup_partial_symbol (pst, "main", 1, VAR_NAMESPACE))
+      {
+	return (pst);
+      }
+  }
   return (NULL);
 }
 
@@ -1211,10 +1216,10 @@ lookup_block_symbol (block, name, namespace)
   if (BLOCK_SHOULD_SORT (block))
     {
       /* Reset the linear search flag so if the binary search fails, we
-	 won't do the linear search once unless we find some reason to
-	 do so, such as finding a C++ symbol during the binary search.
-	 Note that for C++ modules, ALL the symbols in a block should
-	 end up marked as C++ symbols. */
+         won't do the linear search once unless we find some reason to
+         do so, such as finding a C++ symbol during the binary search.
+         Note that for C++ modules, ALL the symbols in a block should
+         end up marked as C++ symbols. */
 
       do_linear_search = 0;
       top = BLOCK_NSYMS (block);
@@ -1235,7 +1240,7 @@ lookup_block_symbol (block, name, namespace)
 	  if (!do_linear_search
 	      && (SYMBOL_LANGUAGE (sym) == language_cplus
 		  || SYMBOL_LANGUAGE (sym) == language_java
-		  ))
+	      ))
 	    {
 	      do_linear_search = 1;
 	    }
@@ -1258,12 +1263,12 @@ lookup_block_symbol (block, name, namespace)
 	}
 
       /* Now scan forward until we run out of symbols, find one whose
-	 name is greater than NAME, or find one we want.  If there is
-	 more than one symbol with the right name and namespace, we
-	 return the first one; I believe it is now impossible for us
-	 to encounter two symbols with the same name and namespace
-	 here, because blocks containing argument symbols are no
-	 longer sorted.  */
+         name is greater than NAME, or find one we want.  If there is
+         more than one symbol with the right name and namespace, we
+         return the first one; I believe it is now impossible for us
+         to encounter two symbols with the same name and namespace
+         here, because blocks containing argument symbols are no
+         longer sorted.  */
 
       top = BLOCK_NSYMS (block);
       while (bot < top)
@@ -1310,13 +1315,13 @@ lookup_block_symbol (block, name, namespace)
 	      SYMBOL_MATCHES_NAME (sym, name))
 	    {
 	      /* If SYM has aliases, then use any alias that is active
-		 at the current PC.  If no alias is active at the current
-		 PC, then use the main symbol.
+	         at the current PC.  If no alias is active at the current
+	         PC, then use the main symbol.
 
-		 ?!? Is checking the current pc correct?  Is this routine
-		 ever called to look up a symbol from another context?  */
-              if (SYMBOL_ALIASES (sym))
-                sym = find_active_alias (sym, read_pc ());
+	         ?!? Is checking the current pc correct?  Is this routine
+	         ever called to look up a symbol from another context?  */
+	      if (SYMBOL_ALIASES (sym))
+		sym = find_active_alias (sym, read_pc ());
 
 	      sym_found = sym;
 	      if (SYMBOL_CLASS (sym) != LOC_ARG &&
@@ -1343,8 +1348,8 @@ lookup_block_symbol (block, name, namespace)
 
 static struct symbol *
 find_active_alias (sym, addr)
-  struct symbol *sym;
-  CORE_ADDR addr;
+     struct symbol *sym;
+     CORE_ADDR addr;
 {
   struct range_list *r;
   struct alias_list *aliases;
@@ -1355,7 +1360,7 @@ find_active_alias (sym, addr)
   while (aliases)
     {
       if (!SYMBOL_RANGES (aliases->sym))
-        return aliases->sym;
+	return aliases->sym;
       for (r = SYMBOL_RANGES (aliases->sym); r; r = r->next)
 	{
 	  if (r->start <= addr && r->end > addr)
@@ -1367,8 +1372,8 @@ find_active_alias (sym, addr)
   /* Nothing found, return the main symbol.  */
   return sym;
 }
-
 
+
 /* Return the symbol for the function which contains a specified
    lexical block, described by a struct block BL.  */
 
@@ -1414,51 +1419,51 @@ find_pc_sect_symtab (pc, section)
      For these, the symtab we are looking for is not necessarily read in.  */
 
   ALL_SYMTABS (objfile, s)
-    {
-      bv = BLOCKVECTOR (s);
-      b = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
+  {
+    bv = BLOCKVECTOR (s);
+    b = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
 
-      if (BLOCK_START (b) <= pc
+    if (BLOCK_START (b) <= pc
 #if defined(HPUXHPPA)
-	  && BLOCK_END (b) >= pc
+	&& BLOCK_END (b) >= pc
 #else
-	  && BLOCK_END (b) > pc
+	&& BLOCK_END (b) > pc
 #endif
-	  && (distance == 0
-	      || BLOCK_END (b) - BLOCK_START (b) < distance))
-	{
-	  /* For an objfile that has its functions reordered,
-	     find_pc_psymtab will find the proper partial symbol table
-	     and we simply return its corresponding symtab.  */
-	  /* In order to better support objfiles that contain both
-	     stabs and coff debugging info, we continue on if a psymtab
-	     can't be found. */
-	  if ((objfile->flags & OBJF_REORDERED) && objfile->psymtabs)
-	    {
-	      ps = find_pc_sect_psymtab (pc, section);
-	      if (ps)
-		return PSYMTAB_TO_SYMTAB (ps);
-	    }
-	  if (section != 0)
-	    {
-	      int i;
+	&& (distance == 0
+	    || BLOCK_END (b) - BLOCK_START (b) < distance))
+      {
+	/* For an objfile that has its functions reordered,
+	   find_pc_psymtab will find the proper partial symbol table
+	   and we simply return its corresponding symtab.  */
+	/* In order to better support objfiles that contain both
+	   stabs and coff debugging info, we continue on if a psymtab
+	   can't be found. */
+	if ((objfile->flags & OBJF_REORDERED) && objfile->psymtabs)
+	  {
+	    ps = find_pc_sect_psymtab (pc, section);
+	    if (ps)
+	      return PSYMTAB_TO_SYMTAB (ps);
+	  }
+	if (section != 0)
+	  {
+	    int i;
 
-	      for (i = 0; i < b->nsyms; i++)
-		{
-		  fixup_symbol_section (b->sym[i], objfile);
-		  if (section == SYMBOL_BFD_SECTION (b->sym[i]))
-		    break;
-		}
-	      if (i >= b->nsyms)
-		continue;	/* no symbol in this symtab matches section */
-	    }
-	  distance = BLOCK_END (b) - BLOCK_START (b);
-	  best_s = s;
-	}
-    }
+	    for (i = 0; i < b->nsyms; i++)
+	      {
+		fixup_symbol_section (b->sym[i], objfile);
+		if (section == SYMBOL_BFD_SECTION (b->sym[i]))
+		  break;
+	      }
+	    if (i >= b->nsyms)
+	      continue;		/* no symbol in this symtab matches section */
+	  }
+	distance = BLOCK_END (b) - BLOCK_START (b);
+	best_s = s;
+      }
+  }
 
   if (best_s != NULL)
-    return(best_s);
+    return (best_s);
 
   s = NULL;
   ps = find_pc_sect_psymtab (pc, section);
@@ -1471,7 +1476,7 @@ find_pc_sect_symtab (pc, section)
 	/* FIXME-32x64: assumes pc fits in a long */
 	warning ("\
 (Internal error: pc 0x%lx in read in psymtab, but not in symtab.)\n",
-	         (unsigned long) pc);
+		 (unsigned long) pc);
       s = PSYMTAB_TO_SYMTAB (ps);
     }
   return (s);
@@ -1486,8 +1491,8 @@ find_pc_symtab (pc)
 {
   return find_pc_sect_symtab (pc, find_pc_mapped_section (pc));
 }
-
 
+
 #if 0
 
 /* Find the closest symbol value (of any sort -- function or variable)
@@ -1518,61 +1523,61 @@ find_addr_symbol (addr, symtabp, symaddrp)
 
   /* FIXME -- we should pull in all the psymtabs, too!  */
   ALL_SYMTABS (objfile, symtab)
-    {
-      /* Search the global and static blocks in this symtab for
-	 the closest symbol-address to the desired address.  */
+  {
+    /* Search the global and static blocks in this symtab for
+       the closest symbol-address to the desired address.  */
 
-      for (blocknum = GLOBAL_BLOCK; blocknum <= STATIC_BLOCK; blocknum++)
-	{
-	  QUIT;
-	  block = BLOCKVECTOR_BLOCK (BLOCKVECTOR (symtab), blocknum);
-	  top = BLOCK_NSYMS (block);
-	  for (bot = 0; bot < top; bot++)
-	    {
-	      sym = BLOCK_SYM (block, bot);
-	      switch (SYMBOL_CLASS (sym))
-		{
-		case LOC_STATIC:	
-		case LOC_LABEL:	
-		  sym_addr = SYMBOL_VALUE_ADDRESS (sym);
-		  break;
+    for (blocknum = GLOBAL_BLOCK; blocknum <= STATIC_BLOCK; blocknum++)
+      {
+	QUIT;
+	block = BLOCKVECTOR_BLOCK (BLOCKVECTOR (symtab), blocknum);
+	top = BLOCK_NSYMS (block);
+	for (bot = 0; bot < top; bot++)
+	  {
+	    sym = BLOCK_SYM (block, bot);
+	    switch (SYMBOL_CLASS (sym))
+	      {
+	      case LOC_STATIC:
+	      case LOC_LABEL:
+		sym_addr = SYMBOL_VALUE_ADDRESS (sym);
+		break;
+
+	      case LOC_INDIRECT:
+		sym_addr = SYMBOL_VALUE_ADDRESS (sym);
+		/* An indirect symbol really lives at *sym_addr,
+		 * so an indirection needs to be done.
+		 * However, I am leaving this commented out because it's
+		 * expensive, and it's possible that symbolization
+		 * could be done without an active process (in
+		 * case this read_memory will fail). RT
+		 sym_addr = read_memory_unsigned_integer
+		 (sym_addr, TARGET_PTR_BIT / TARGET_CHAR_BIT);
+		 */
+		break;
 
-                case LOC_INDIRECT:
-		  sym_addr = SYMBOL_VALUE_ADDRESS (sym);
-                  /* An indirect symbol really lives at *sym_addr,
-                   * so an indirection needs to be done.
-                   * However, I am leaving this commented out because it's
-                   * expensive, and it's possible that symbolization
-                   * could be done without an active process (in
-                   * case this read_memory will fail). RT
-                  sym_addr = read_memory_unsigned_integer
-                      (sym_addr, TARGET_PTR_BIT / TARGET_CHAR_BIT);
-                   */
-                  break;
-
-		case LOC_BLOCK:
-		  sym_addr = BLOCK_START (SYMBOL_BLOCK_VALUE (sym));
-		  break;
+	      case LOC_BLOCK:
+		sym_addr = BLOCK_START (SYMBOL_BLOCK_VALUE (sym));
+		break;
 
-		default:
-		  continue;
-		}
+	      default:
+		continue;
+	      }
 
-		if (sym_addr <= addr)
-		  if (sym_addr > best_sym_addr)
-		    {
-		      /* Quit if we found an exact match.  */
-		      best_sym = sym;
-		      best_sym_addr = sym_addr;
-		      best_symtab = symtab;
-		      if (sym_addr == addr)
-			goto done;
-		    }
-	    }
-	}
-    }
+	    if (sym_addr <= addr)
+	      if (sym_addr > best_sym_addr)
+		{
+		  /* Quit if we found an exact match.  */
+		  best_sym = sym;
+		  best_sym_addr = sym_addr;
+		  best_symtab = symtab;
+		  if (sym_addr == addr)
+		    goto done;
+		}
+	  }
+      }
+  }
 
- done:
+done:
   if (symtabp)
     *symtabp = best_symtab;
   if (symaddrp)
@@ -1638,19 +1643,19 @@ find_pc_sect_line (pc, section, notcurrent)
      But what we want is the statement containing the instruction.
      Fudge the pc to make sure we get that.  */
 
-  INIT_SAL (&val);	/* initialize to zeroes */
+  INIT_SAL (&val);		/* initialize to zeroes */
 
   if (notcurrent)
     pc -= 1;
 
- /* elz: added this because this function returned the wrong
+  /* elz: added this because this function returned the wrong
      information if the pc belongs to a stub (import/export)
      to call a shlib function. This stub would be anywhere between
      two functions in the target, and the line info was erroneously 
      taken to be the one of the line before the pc. 
-  */
+   */
   /* RT: Further explanation:
-   *
+
    * We have stubs (trampolines) inserted between procedures.
    *
    * Example: "shr1" exists in a shared library, and a "shr1" stub also
@@ -1687,31 +1692,31 @@ find_pc_sect_line (pc, section, notcurrent)
    *      check for the address being the same, to avoid an
    *      infinite recursion.
    */
-  msymbol = lookup_minimal_symbol_by_pc(pc);
-  if (msymbol != NULL) 
+  msymbol = lookup_minimal_symbol_by_pc (pc);
+  if (msymbol != NULL)
     if (MSYMBOL_TYPE (msymbol) == mst_solib_trampoline)
-    {
-     mfunsym = lookup_minimal_symbol_text (SYMBOL_NAME (msymbol), NULL, NULL);
-     if (mfunsym == NULL) 
-        /* I eliminated this warning since it is coming out
-         * in the following situation:
-         * gdb shmain // test program with shared libraries
-         * (gdb) break shr1  // function in shared lib
-         * Warning: In stub for ...
-         * In the above situation, the shared lib is not loaded yet, 
-         * so of course we can't find the real func/line info,
-         * but the "break" still works, and the warning is annoying.
-         * So I commented out the warning. RT */
-        /* warning ("In stub for %s; unable to find real function/line info", SYMBOL_NAME(msymbol)) */;
-        /* fall through */
-     else if (SYMBOL_VALUE(mfunsym) == SYMBOL_VALUE(msymbol))
-        /* Avoid infinite recursion */
-        /* See above comment about why warning is commented out */
-        /* warning ("In stub for %s; unable to find real function/line info", SYMBOL_NAME(msymbol)) */;
-        /* fall through */
-     else
-       return find_pc_line( SYMBOL_VALUE (mfunsym), 0);
-    }
+      {
+	mfunsym = lookup_minimal_symbol_text (SYMBOL_NAME (msymbol), NULL, NULL);
+	if (mfunsym == NULL)
+	  /* I eliminated this warning since it is coming out
+	   * in the following situation:
+	   * gdb shmain // test program with shared libraries
+	   * (gdb) break shr1  // function in shared lib
+	   * Warning: In stub for ...
+	   * In the above situation, the shared lib is not loaded yet, 
+	   * so of course we can't find the real func/line info,
+	   * but the "break" still works, and the warning is annoying.
+	   * So I commented out the warning. RT */
+	  /* warning ("In stub for %s; unable to find real function/line info", SYMBOL_NAME(msymbol)) */ ;
+	/* fall through */
+	else if (SYMBOL_VALUE (mfunsym) == SYMBOL_VALUE (msymbol))
+	  /* Avoid infinite recursion */
+	  /* See above comment about why warning is commented out */
+	  /* warning ("In stub for %s; unable to find real function/line info", SYMBOL_NAME(msymbol)) */ ;
+	/* fall through */
+	else
+	  return find_pc_line (SYMBOL_VALUE (mfunsym), 0);
+      }
 
 
   s = find_pc_sect_symtab (pc, section);
@@ -1735,7 +1740,7 @@ find_pc_sect_line (pc, section, notcurrent)
       /* Find the best line in this symtab.  */
       l = LINETABLE (s);
       if (!l)
-        continue;
+	continue;
       len = l->nitems;
       if (len <= 0)
 	{
@@ -1750,7 +1755,7 @@ find_pc_sect_line (pc, section, notcurrent)
       item = l->item;		/* Get first line info */
 
       /* Is this file's first line closer than the first lines of other files?
-	 If so, record this file, and its first line, as best alternate.  */
+         If so, record this file, and its first line, as best alternate.  */
       if (item->pc > pc && (!alt || item->pc < alt->pc))
 	{
 	  alt = item;
@@ -1768,12 +1773,12 @@ find_pc_sect_line (pc, section, notcurrent)
 	}
 
       /* At this point, prev points at the line whose start addr is <= pc, and
-	 item points at the next line.  If we ran off the end of the linetable
-	 (pc >= start of the last line), then prev == item.  If pc < start of
-	 the first line, prev will not be set.  */
+         item points at the next line.  If we ran off the end of the linetable
+         (pc >= start of the last line), then prev == item.  If pc < start of
+         the first line, prev will not be set.  */
 
       /* Is this file's best line closer than the best in the other files?
-	 If so, record this file, and its best line, as best so far.  */
+         If so, record this file, and its best line, as best so far.  */
 
       if (prev && (!best || prev->pc > best->pc))
 	{
@@ -1799,7 +1804,8 @@ find_pc_sect_line (pc, section, notcurrent)
 	  val.line = alt->line - 1;
 
 	  /* Don't return line 0, that means that we didn't find the line.  */
-	  if (val.line == 0) ++val.line;
+	  if (val.line == 0)
+	    ++val.line;
 
 	  val.pc = BLOCK_END (BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK));
 	  val.end = alt->pc;
@@ -1828,16 +1834,16 @@ find_pc_line (pc, notcurrent)
      CORE_ADDR pc;
      int notcurrent;
 {
-  asection     *section;
+  asection *section;
 
   section = find_pc_overlay (pc);
   if (pc_in_unmapped_range (pc, section))
     pc = overlay_mapped_address (pc, section);
   return find_pc_sect_line (pc, section, notcurrent);
 }
-
 
-static struct symtab* find_line_symtab PARAMS ((struct symtab *, int,
+
+static struct symtab *find_line_symtab PARAMS ((struct symtab *, int,
 						int *, int *));
 
 /* Find line number LINE in any symtab whose name is the same as
@@ -1850,7 +1856,7 @@ static struct symtab* find_line_symtab PARAMS ((struct symtab *, int,
 
    If not found, return NULL.  */
 
-static struct symtab*
+static struct symtab *
 find_line_symtab (symtab, line, index, exact_match)
      struct symtab *symtab;
      int line;
@@ -1873,15 +1879,15 @@ find_line_symtab (symtab, line, index, exact_match)
   if (best_index < 0 || !exact)
     {
       /* Didn't find an exact match.  So we better keep looking for
-	 another symtab with the same name.  In the case of xcoff,
-	 multiple csects for one source file (produced by IBM's FORTRAN
-	 compiler) produce multiple symtabs (this is unavoidable
-	 assuming csects can be at arbitrary places in memory and that
-	 the GLOBAL_BLOCK of a symtab has a begin and end address).  */
+         another symtab with the same name.  In the case of xcoff,
+         multiple csects for one source file (produced by IBM's FORTRAN
+         compiler) produce multiple symtabs (this is unavoidable
+         assuming csects can be at arbitrary places in memory and that
+         the GLOBAL_BLOCK of a symtab has a begin and end address).  */
 
       /* BEST is the smallest linenumber > LINE so far seen,
-	 or 0 if none has been seen so far.
-	 BEST_INDEX and BEST_LINETABLE identify the item for it.  */
+         or 0 if none has been seen so far.
+         BEST_INDEX and BEST_LINETABLE identify the item for it.  */
       int best;
 
       struct objfile *objfile;
@@ -1893,34 +1899,34 @@ find_line_symtab (symtab, line, index, exact_match)
 	best = 0;
 
       ALL_SYMTABS (objfile, s)
-	{
-	  struct linetable *l;
-	  int ind;
+      {
+	struct linetable *l;
+	int ind;
 
-	  if (!STREQ (symtab->filename, s->filename))
-	    continue;
-	  l = LINETABLE (s);
-	  ind = find_line_common (l, line, &exact);
-	  if (ind >= 0)
-	    {
-	      if (exact)
-		{
-		  best_index = ind;
-		  best_linetable = l;
-		  best_symtab = s;
-		  goto done;
-		}
-	      if (best == 0 || l->item[ind].line < best)
-		{
-		  best = l->item[ind].line;
-		  best_index = ind;
-		  best_linetable = l;
-		  best_symtab = s;
-		}
-	    }
-	}
+	if (!STREQ (symtab->filename, s->filename))
+	  continue;
+	l = LINETABLE (s);
+	ind = find_line_common (l, line, &exact);
+	if (ind >= 0)
+	  {
+	    if (exact)
+	      {
+		best_index = ind;
+		best_linetable = l;
+		best_symtab = s;
+		goto done;
+	      }
+	    if (best == 0 || l->item[ind].line < best)
+	      {
+		best = l->item[ind].line;
+		best_index = ind;
+		best_linetable = l;
+		best_symtab = s;
+	      }
+	  }
+      }
     }
- done:
+done:
   if (best_index < 0)
     return NULL;
 
@@ -1975,7 +1981,7 @@ find_line_pc_range (sal, startptr, endptr)
   struct symtab_and_line found_sal;
 
   startaddr = sal.pc;
-  if (startaddr==0 && !find_line_pc (sal.symtab, sal.line, &startaddr))
+  if (startaddr == 0 && !find_line_pc (sal.symtab, sal.line, &startaddr))
     return 0;
 
   /* This whole function is based on address.  For example, if line 10 has
@@ -2070,7 +2076,7 @@ find_pc_line_pc_range (pc, startptr, endptr)
    of real code inside the function.  */
 
 static struct symtab_and_line
-find_function_start_sal PARAMS ((struct symbol *sym, int));
+find_function_start_sal PARAMS ((struct symbol * sym, int));
 
 static struct symtab_and_line
 find_function_start_sal (sym, funfirstline)
@@ -2083,10 +2089,10 @@ find_function_start_sal (sym, funfirstline)
   pc = BLOCK_START (SYMBOL_BLOCK_VALUE (sym));
   fixup_symbol_section (sym, NULL);
   if (funfirstline)
-    { /* skip "first line" of function (which is actually its prologue) */
+    {				/* skip "first line" of function (which is actually its prologue) */
       asection *section = SYMBOL_BFD_SECTION (sym);
       /* If function is in an unmapped overlay, use its unmapped LMA
-	 address, so that SKIP_PROLOGUE has something unique to work on */
+         address, so that SKIP_PROLOGUE has something unique to work on */
       if (section_is_overlay (section) &&
 	  !section_is_mapped (section))
 	pc = overlay_unmapped_address (pc, section);
@@ -2136,7 +2142,7 @@ operator_chars (p, end)
 
   /* Don't get faked out by `operator' being part of a longer
      identifier.  */
-  if (isalpha(*p) || *p == '_' || *p == '$' || *p == '\0')
+  if (isalpha (*p) || *p == '_' || *p == '$' || *p == '\0')
     return *end;
 
   /* Allow some whitespace between `operator' and the operator symbol.  */
@@ -2145,10 +2151,10 @@ operator_chars (p, end)
 
   /* Recognize 'operator TYPENAME'. */
 
-  if (isalpha(*p) || *p == '_' || *p == '$')
+  if (isalpha (*p) || *p == '_' || *p == '$')
     {
-      register char *q = p+1;
-      while (isalnum(*q) || *q == '_' || *q == '$')
+      register char *q = p + 1;
+      while (isalnum (*q) || *q == '_' || *q == '$')
 	q++;
       *end = q;
       return p;
@@ -2163,9 +2169,9 @@ operator_chars (p, end)
     case '%':
     case '^':
       if (p[1] == '=')
-	*end = p+2;
+	*end = p + 2;
       else
-	*end = p+1;
+	*end = p + 1;
       return p;
     case '<':
     case '>':
@@ -2174,28 +2180,28 @@ operator_chars (p, end)
     case '&':
     case '|':
       if (p[1] == '=' || p[1] == p[0])
-	*end = p+2;
+	*end = p + 2;
       else
-	*end = p+1;
+	*end = p + 1;
       return p;
     case '~':
     case ',':
-      *end = p+1;
+      *end = p + 1;
       return p;
     case '(':
       if (p[1] != ')')
 	error ("`operator ()' must be specified without whitespace in `()'");
-      *end = p+2;
+      *end = p + 2;
       return p;
     case '?':
       if (p[1] != ':')
 	error ("`operator ?:' must be specified without whitespace in `?:'");
-      *end = p+2;
+      *end = p + 2;
       return p;
     case '[':
       if (p[1] != ']')
 	error ("`operator []' must be specified without whitespace in `[]'");
-      *end = p+2;
+      *end = p + 2;
       return p;
     default:
       error ("`operator %s' not supported", p);
@@ -2210,7 +2216,7 @@ operator_chars (p, end)
    reader because the type of the baseclass might still be stubbed
    when the definition of the derived class is parsed.  */
 
-static int total_number_of_methods PARAMS ((struct type *type));
+static int total_number_of_methods PARAMS ((struct type * type));
 
 static int
 total_number_of_methods (type)
@@ -2253,10 +2259,10 @@ find_methods (t, name, sym_arr)
      the class, then the loop can't do any good.  */
   if (class_name
       && (sym_class = lookup_symbol (class_name,
-				     (struct block *)NULL,
+				     (struct block *) NULL,
 				     STRUCT_NAMESPACE,
-				     (int *)NULL,
-				     (struct symtab **)NULL)))
+				     (int *) NULL,
+				     (struct symtab **) NULL)))
     {
       int method_counter;
 
@@ -2264,8 +2270,8 @@ find_methods (t, name, sym_arr)
       t = SYMBOL_TYPE (sym_class);
 
       /* Loop over each method name.  At this level, all overloads of a name
-	 are counted as a single name.  There is an inner loop which loops over
-	 each overload.  */
+         are counted as a single name.  There is an inner loop which loops over
+         each overload.  */
 
       for (method_counter = TYPE_NFN_FIELDS (t) - 1;
 	   method_counter >= 0;
@@ -2275,15 +2281,15 @@ find_methods (t, name, sym_arr)
 	  char *method_name = TYPE_FN_FIELDLIST_NAME (t, method_counter);
 	  char dem_opname[64];
 
-          if (strncmp (method_name, "__", 2) == 0 ||
+	  if (strncmp (method_name, "__", 2) == 0 ||
 	      strncmp (method_name, "op", 2) == 0 ||
 	      strncmp (method_name, "type", 4) == 0)
-            {
+	    {
 	      if (cplus_demangle_opname (method_name, dem_opname, DMGL_ANSI))
-	        method_name = dem_opname;
+		method_name = dem_opname;
 	      else if (cplus_demangle_opname (method_name, dem_opname, 0))
-	        method_name = dem_opname; 
-            }
+		method_name = dem_opname;
+	    }
 
 	  if (STREQ (name, method_name))
 	    /* Find all the overloaded methods with that name.  */
@@ -2301,8 +2307,8 @@ find_methods (t, name, sym_arr)
 		    char *tmp_name;
 
 		    tmp_name = gdb_mangle_name (t,
-						 method_counter,
-						 field_counter);
+						method_counter,
+						field_counter);
 		    phys_name = alloca (strlen (tmp_name) + 1);
 		    strcpy (phys_name, tmp_name);
 		    free (tmp_name);
@@ -2329,7 +2335,7 @@ find_methods (t, name, sym_arr)
 		       language_cplus,
 		       DMGL_PARAMS | DMGL_ANSI);
 		       fputs_filtered(" - possibly inlined.)\n", gdb_stdout);
-		       */
+		     */
 		  }
 	      }
 	}
@@ -2371,11 +2377,11 @@ build_canonical_line_spec (sal, symname, canonical)
   char *filename;
   struct symtab *s = sal->symtab;
 
-  if (s == (struct symtab *)NULL
-      || s->filename == (char *)NULL
-      || canonical == (char ***)NULL)
+  if (s == (struct symtab *) NULL
+      || s->filename == (char *) NULL
+      || canonical == (char ***) NULL)
     return;
- 
+
   canonical_arr = (char **) xmalloc (sizeof (char *));
   *canonical = canonical_arr;
 
@@ -2402,9 +2408,9 @@ build_canonical_line_spec (sal, symname, canonical)
    LINENUM -- that line number in current file.  PC returned is 0.
    FILE:LINENUM -- that line in that file.  PC returned is 0.
    FUNCTION -- line number of openbrace of that function.
-      PC returned is the start of the function.
+   PC returned is the start of the function.
    VARIABLE -- line number of definition of that variable.
-      PC returned is 0.
+   PC returned is 0.
    FILE:FUNCTION -- likewise, but prefer functions in that file.
    *EXPR -- line in which address EXPR appears.
 
@@ -2470,7 +2476,7 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical)
      will have been defined away in defs.h.  */
 #undef volatile
   volatile struct symtab_and_line val;
-#define volatile /*nothing*/
+#define volatile		/*nothing */
 #else
   struct symtab_and_line val;
 #endif
@@ -2492,15 +2498,15 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical)
   int i1;
   int is_quoted;
   int is_quote_enclosed;
-  int has_parens;  
+  int has_parens;
   int has_if = 0;
   int has_comma = 0;
   struct symbol **sym_arr;
   struct type *t;
   char *saved_arg = *argptr;
   extern char *gdb_completer_quote_characters;
-  
-  INIT_SAL (&val);	/* initialize to zeroes */
+
+  INIT_SAL (&val);		/* initialize to zeroes */
 
   /* Defaults have defaults.  */
 
@@ -2531,20 +2537,21 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical)
   /* 'has_if' is for the syntax:
    *     (gdb) break foo if (a==b)
    */
-  if ((ii = strstr(*argptr, " if ")) != NULL ||
-      (ii = strstr(*argptr, "\tif ")) != NULL ||
-      (ii = strstr(*argptr, " if\t")) != NULL ||
-      (ii = strstr(*argptr, "\tif\t")) != NULL ||
-      (ii = strstr(*argptr, " if(")) != NULL ||
-      (ii = strstr(*argptr, "\tif( ")) != NULL) 
+  if ((ii = strstr (*argptr, " if ")) != NULL ||
+      (ii = strstr (*argptr, "\tif ")) != NULL ||
+      (ii = strstr (*argptr, " if\t")) != NULL ||
+      (ii = strstr (*argptr, "\tif\t")) != NULL ||
+      (ii = strstr (*argptr, " if(")) != NULL ||
+      (ii = strstr (*argptr, "\tif( ")) != NULL)
     has_if = 1;
   /* Temporarily zap out "if (condition)" to not
    * confuse the parenthesis-checking code below.
    * This is undone below. Do not change ii!!
    */
-  if (has_if) {
-    *ii = '\0';
-  }
+  if (has_if)
+    {
+      *ii = '\0';
+    }
 
   /* Set various flags.
    * 'has_parens' is important for overload checking, where
@@ -2558,7 +2565,7 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical)
 	       && strchr (gdb_completer_quote_characters, **argptr) != NULL);
 
   has_parens = ((pp = strchr (*argptr, '(')) != NULL
-		 && (pp = strchr (pp, ')')) != NULL);
+		&& (pp = strchr (pp, ')')) != NULL);
 
   /* Now that we're safely past the has_parens check,
    * put back " if (condition)" so outer layers can see it 
@@ -2569,15 +2576,16 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical)
   /* Maybe we were called with a line range FILENAME:LINENUM,FILENAME:LINENUM
      and we must isolate the first half.  Outer layers will call again later
      for the second half */
-  if ((ii = strchr(*argptr, ',')) != NULL)
+  if ((ii = strchr (*argptr, ',')) != NULL)
     has_comma = 1;
   /* Temporarily zap out second half to not
    * confuse the code below.
    * This is undone below. Do not change ii!!
    */
-  if (has_comma) {
-    *ii = '\0';
-  }
+  if (has_comma)
+    {
+      *ii = '\0';
+    }
 
   /* Maybe arg is FILE : LINENUM or FILE : FUNCTION */
   /* May also be CLASS::MEMBER, or NAMESPACE::NAME */
@@ -2591,29 +2599,29 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical)
       p++;
     }
   else
-      is_quote_enclosed = 0;
-  for ( ; *p; p++)
+    is_quote_enclosed = 0;
+  for (; *p; p++)
     {
-      if (p[0] == '<') 
+      if (p[0] == '<')
 	{
-          char * temp_end = find_template_name_end (p);
-          if (!temp_end)
-            error ("malformed template specification in command");
-          p = temp_end;
+	  char *temp_end = find_template_name_end (p);
+	  if (!temp_end)
+	    error ("malformed template specification in command");
+	  p = temp_end;
 	}
       /* Check for the end of the first half of the linespec.  End of line,
          a tab, a double colon or the last single colon, or a space.  But
          if enclosed in double quotes we do not break on enclosed spaces */
       if (!*p
-          || p[0] == '\t'
-          || ((p[0] == ':')
-              && ((p[1] == ':') || (strchr (p + 1, ':') == NULL)))
-          || ((p[0] == ' ') && ! is_quote_enclosed))
-        break;
-      if (p[0] == '.' && strchr (p, ':') == NULL) /* Java qualified method. */
+	  || p[0] == '\t'
+	  || ((p[0] == ':')
+	      && ((p[1] == ':') || (strchr (p + 1, ':') == NULL)))
+	  || ((p[0] == ' ') && !is_quote_enclosed))
+	break;
+      if (p[0] == '.' && strchr (p, ':') == NULL)	/* Java qualified method. */
 	{
 	  /* Find the *last* '.', since the others are package qualifiers. */
-	  for (p1 = p;  *p1;  p1++)
+	  for (p1 = p; *p1; p1++)
 	    {
 	      if (*p1 == '.')
 		p = p1;
@@ -2621,10 +2629,11 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical)
 	  break;
 	}
     }
-  while (p[0] == ' ' || p[0] == '\t') p++;
+  while (p[0] == ' ' || p[0] == '\t')
+    p++;
   /* if the closing double quote was left at the end, remove it */
   if (is_quote_enclosed && ((pp = strchr (p, '"')) != NULL))
-    if (!*(pp+1))
+    if (!*(pp + 1))
       *pp = '\0';
 
   /* Now that we've safely parsed the first half,
@@ -2637,262 +2646,271 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical)
     {
       /*  C++ */
       /*  ... or Java */
-      if (is_quoted) *argptr = *argptr+1;
-      if (p[0] == '.' || p[1] ==':')
+      if (is_quoted)
+	*argptr = *argptr + 1;
+      if (p[0] == '.' || p[1] == ':')
 	{
-          int ix;
-          char * saved_arg2 = *argptr;
-          char * temp_end;
-          /* First check for "global" namespace specification,
-             of the form "::foo". If found, skip over the colons
-             and jump to normal symbol processing */
-          if ((*argptr == p) || (p[-1] == ' ') || (p[-1] == '\t'))
-            saved_arg2 += 2;
-
-          /* We have what looks like a class or namespace
-             scope specification (A::B), possibly with many
-             levels of namespaces or classes (A::B::C::D).
-
-             Some versions of the HP ANSI C++ compiler (as also possibly
-             other compilers) generate class/function/member names with
-             embedded double-colons if they are inside namespaces. To
-             handle this, we loop a few times, considering larger and
-             larger prefixes of the string as though they were single
-             symbols.  So, if the initially supplied string is
-             A::B::C::D::foo, we have to look up "A", then "A::B",
-             then "A::B::C", then "A::B::C::D", and finally
-             "A::B::C::D::foo" as single, monolithic symbols, because
-             A, B, C or D may be namespaces.
-
-             Note that namespaces can nest only inside other
-             namespaces, and not inside classes.  So we need only
-             consider *prefixes* of the string; there is no need to look up
-             "B::C" separately as a symbol in the previous example. */
-          
-          p2 = p; /* save for restart */
-          while (1)
-            {
-  	     /* Extract the class name.  */
-	     p1 = p;
-	     while (p != *argptr && p[-1] == ' ') --p;
-	     copy = (char *) alloca (p - *argptr + 1);
-	     memcpy (copy, *argptr, p - *argptr);
-	     copy[p - *argptr] = 0;
-
-	     /* Discard the class name from the arg.  */
-	     p = p1 + (p1[0] == ':' ? 2 : 1);
-	     while (*p == ' ' || *p == '\t') p++;
-	     *argptr = p;
-
-	     sym_class = lookup_symbol (copy, 0, STRUCT_NAMESPACE, 0, 
-				        (struct symtab **)NULL);
-       
-	     if (sym_class &&
-	         (t = check_typedef (SYMBOL_TYPE (sym_class)),
-	          (TYPE_CODE (t) == TYPE_CODE_STRUCT
-		   || TYPE_CODE (t) == TYPE_CODE_UNION)))
-	       {
-	         /* Arg token is not digits => try it as a function name
-		    Find the next token(everything up to end or next blank). */
-	         if (**argptr
-		     && strchr (gdb_completer_quote_characters, **argptr) != NULL)
-		   {
-		     p = skip_quoted(*argptr);
-		     *argptr = *argptr + 1;
-		   }
-	         else
-		   {
-	             p = *argptr;
-	             while (*p && *p!=' ' && *p!='\t' && *p!=',' && *p!=':') p++;
-		   }
-/*
-	      q = operator_chars (*argptr, &q1);
-	      if (q1 - q)
+	  int ix;
+	  char *saved_arg2 = *argptr;
+	  char *temp_end;
+	  /* First check for "global" namespace specification,
+	     of the form "::foo". If found, skip over the colons
+	     and jump to normal symbol processing */
+	  if ((*argptr == p) || (p[-1] == ' ') || (p[-1] == '\t'))
+	    saved_arg2 += 2;
+
+	  /* We have what looks like a class or namespace
+	     scope specification (A::B), possibly with many
+	     levels of namespaces or classes (A::B::C::D).
+
+	     Some versions of the HP ANSI C++ compiler (as also possibly
+	     other compilers) generate class/function/member names with
+	     embedded double-colons if they are inside namespaces. To
+	     handle this, we loop a few times, considering larger and
+	     larger prefixes of the string as though they were single
+	     symbols.  So, if the initially supplied string is
+	     A::B::C::D::foo, we have to look up "A", then "A::B",
+	     then "A::B::C", then "A::B::C::D", and finally
+	     "A::B::C::D::foo" as single, monolithic symbols, because
+	     A, B, C or D may be namespaces.
+
+	     Note that namespaces can nest only inside other
+	     namespaces, and not inside classes.  So we need only
+	     consider *prefixes* of the string; there is no need to look up
+	     "B::C" separately as a symbol in the previous example. */
+
+	  p2 = p;		/* save for restart */
+	  while (1)
+	    {
+	      /* Extract the class name.  */
+	      p1 = p;
+	      while (p != *argptr && p[-1] == ' ')
+		--p;
+	      copy = (char *) alloca (p - *argptr + 1);
+	      memcpy (copy, *argptr, p - *argptr);
+	      copy[p - *argptr] = 0;
+
+	      /* Discard the class name from the arg.  */
+	      p = p1 + (p1[0] == ':' ? 2 : 1);
+	      while (*p == ' ' || *p == '\t')
+		p++;
+	      *argptr = p;
+
+	      sym_class = lookup_symbol (copy, 0, STRUCT_NAMESPACE, 0,
+					 (struct symtab **) NULL);
+
+	      if (sym_class &&
+		  (t = check_typedef (SYMBOL_TYPE (sym_class)),
+		   (TYPE_CODE (t) == TYPE_CODE_STRUCT
+		    || TYPE_CODE (t) == TYPE_CODE_UNION)))
 		{
-		  char *opname;
-		  char *tmp = alloca (q1 - q + 1);
-		  memcpy (tmp, q, q1 - q);
-		  tmp[q1 - q] = '\0';
-		  opname = cplus_mangle_opname (tmp, DMGL_ANSI);
-		  if (opname == NULL)
+		  /* Arg token is not digits => try it as a function name
+		     Find the next token(everything up to end or next blank). */
+		  if (**argptr
+		      && strchr (gdb_completer_quote_characters, **argptr) != NULL)
+		    {
+		      p = skip_quoted (*argptr);
+		      *argptr = *argptr + 1;
+		    }
+		  else
+		    {
+		      p = *argptr;
+		      while (*p && *p != ' ' && *p != '\t' && *p != ',' && *p != ':')
+			p++;
+		    }
+/*
+   q = operator_chars (*argptr, &q1);
+   if (q1 - q)
+   {
+   char *opname;
+   char *tmp = alloca (q1 - q + 1);
+   memcpy (tmp, q, q1 - q);
+   tmp[q1 - q] = '\0';
+   opname = cplus_mangle_opname (tmp, DMGL_ANSI);
+   if (opname == NULL)
+   {
+   error_begin ();
+   printf_filtered ("no mangling for \"%s\"\n", tmp);
+   cplusplus_hint (saved_arg);
+   return_to_top_level (RETURN_ERROR);
+   }
+   copy = (char*) alloca (3 + strlen(opname));
+   sprintf (copy, "__%s", opname);
+   p = q1;
+   }
+   else
+ */
+		  {
+		    copy = (char *) alloca (p - *argptr + 1);
+		    memcpy (copy, *argptr, p - *argptr);
+		    copy[p - *argptr] = '\0';
+		    if (p != *argptr
+			&& copy[p - *argptr - 1]
+			&& strchr (gdb_completer_quote_characters,
+				   copy[p - *argptr - 1]) != NULL)
+		      copy[p - *argptr - 1] = '\0';
+		  }
+
+		  /* no line number may be specified */
+		  while (*p == ' ' || *p == '\t')
+		    p++;
+		  *argptr = p;
+
+		  sym = 0;
+		  i1 = 0;	/*  counter for the symbol array */
+		  sym_arr = (struct symbol **) alloca (total_number_of_methods (t)
+						* sizeof (struct symbol *));
+
+		  if (destructor_name_p (copy, t))
+		    {
+		      /* Destructors are a special case.  */
+		      int m_index, f_index;
+
+		      if (get_destructor_fn_field (t, &m_index, &f_index))
+			{
+			  struct fn_field *f = TYPE_FN_FIELDLIST1 (t, m_index);
+
+			  sym_arr[i1] =
+			    lookup_symbol (TYPE_FN_FIELD_PHYSNAME (f, f_index),
+					   NULL, VAR_NAMESPACE, (int *) NULL,
+					   (struct symtab **) NULL);
+			  if (sym_arr[i1])
+			    i1++;
+			}
+		    }
+		  else
+		    i1 = find_methods (t, copy, sym_arr);
+		  if (i1 == 1)
+		    {
+		      /* There is exactly one field with that name.  */
+		      sym = sym_arr[0];
+
+		      if (sym && SYMBOL_CLASS (sym) == LOC_BLOCK)
+			{
+			  values.sals = (struct symtab_and_line *)
+			    xmalloc (sizeof (struct symtab_and_line));
+			  values.nelts = 1;
+			  values.sals[0] = find_function_start_sal (sym,
+							      funfirstline);
+			}
+		      else
+			{
+			  values.nelts = 0;
+			}
+		      return values;
+		    }
+		  if (i1 > 0)
+		    {
+		      /* There is more than one field with that name
+		         (overloaded).  Ask the user which one to use.  */
+		      return decode_line_2 (sym_arr, i1, funfirstline, canonical);
+		    }
+		  else
 		    {
+		      char *tmp;
+
+		      if (OPNAME_PREFIX_P (copy))
+			{
+			  tmp = (char *) alloca (strlen (copy + 3) + 9);
+			  strcpy (tmp, "operator ");
+			  strcat (tmp, copy + 3);
+			}
+		      else
+			tmp = copy;
 		      error_begin ();
-		      printf_filtered ("no mangling for \"%s\"\n", tmp);
+		      if (tmp[0] == '~')
+			printf_filtered
+			  ("the class `%s' does not have destructor defined\n",
+			   SYMBOL_SOURCE_NAME (sym_class));
+		      else
+			printf_filtered
+			  ("the class %s does not have any method named %s\n",
+			   SYMBOL_SOURCE_NAME (sym_class), tmp);
 		      cplusplus_hint (saved_arg);
 		      return_to_top_level (RETURN_ERROR);
 		    }
-		  copy = (char*) alloca (3 + strlen(opname));
-		  sprintf (copy, "__%s", opname);
-		  p = q1;
 		}
-	      else
-*/
-		   {
-		     copy = (char *) alloca (p - *argptr + 1 );
-		     memcpy (copy, *argptr, p - *argptr);
-		     copy[p - *argptr] = '\0';
-		     if (p != *argptr
-		         && copy[p - *argptr - 1]
-		         && strchr (gdb_completer_quote_characters,
-				    copy[p - *argptr - 1]) != NULL)
-		       copy[p - *argptr - 1] = '\0';
-		   }
-
-	         /* no line number may be specified */
-	         while (*p == ' ' || *p == '\t') p++;
-	         *argptr = p;
-
-	         sym = 0;
-	         i1 = 0;		/*  counter for the symbol array */
-	         sym_arr = (struct symbol **) alloca(total_number_of_methods (t)
-						     * sizeof(struct symbol *));
-
-	         if (destructor_name_p (copy, t))
-		   {
-		     /* Destructors are a special case.  */
-		     int m_index, f_index;
-
-		     if (get_destructor_fn_field (t, &m_index, &f_index))
-		       {
-		         struct fn_field *f = TYPE_FN_FIELDLIST1 (t, m_index);
-
-		         sym_arr[i1] =
-			   lookup_symbol (TYPE_FN_FIELD_PHYSNAME (f, f_index),
-				          NULL, VAR_NAMESPACE, (int *) NULL,
-				          (struct symtab **)NULL);
-		         if (sym_arr[i1])
-			   i1++;
-		       }
-		   }
-	         else
-		   i1 = find_methods (t, copy, sym_arr);
-	         if (i1 == 1)
-		   {
-		     /* There is exactly one field with that name.  */
-		     sym = sym_arr[0];
-
-		     if (sym && SYMBOL_CLASS (sym) == LOC_BLOCK)
-		       {
-		         values.sals = (struct symtab_and_line *)
-			   xmalloc (sizeof (struct symtab_and_line));
-		         values.nelts = 1;
-		         values.sals[0] = find_function_start_sal (sym,
-				 				   funfirstline);
-		       }
-		     else
-		       {
-		         values.nelts = 0;
-		       }
-		     return values;
-		   }
-	         if (i1 > 0)
-		   {
-		     /* There is more than one field with that name
-		        (overloaded).  Ask the user which one to use.  */
-		     return decode_line_2 (sym_arr, i1, funfirstline, canonical);
-		   }
-	         else
-		   {
-		     char *tmp;
-
-		     if (OPNAME_PREFIX_P (copy))
-		       {
-		         tmp = (char *)alloca (strlen (copy+3) + 9);
-		         strcpy (tmp, "operator ");
-		         strcat (tmp, copy+3);
-		       }
-		     else
-		       tmp = copy;
-		     error_begin ();
-		     if (tmp[0] == '~')
-		       printf_filtered
-		         ("the class `%s' does not have destructor defined\n",
-		          SYMBOL_SOURCE_NAME(sym_class));
-		     else
-		       printf_filtered
-		         ("the class %s does not have any method named %s\n",
-		          SYMBOL_SOURCE_NAME(sym_class), tmp);
-		     cplusplus_hint (saved_arg);
-		     return_to_top_level (RETURN_ERROR);
-		   }
-	       }
-
-             /* Move pointer up to next possible class/namespace token */
-              p = p2 + 1; /* restart with old value +1 */
-              /* Move pointer ahead to next double-colon */
-              while (*p && (p[0] != ' ') && (p[0] != '\t') && (p[0] != '\'')) {
-                if (p[0] == '<') {
-                  temp_end = find_template_name_end (p);
-                  if (!temp_end)
-                    error ("malformed template specification in command");
-                  p = temp_end;
-                }
-                else if ((p[0] == ':') && (p[1] == ':'))
-                  break; /* found double-colon */
-                else
-                  p++;
-              }
-              
-              if (*p != ':')
-                break; /* out of the while (1) */
-
-              p2 = p; /* save restart for next time around */
-              *argptr = saved_arg2; /* restore argptr */
-            } /* while (1) */
-
-          /* Last chance attempt -- check entire name as a symbol */
-          /* Use "copy" in preparation for jumping out of this block,
-             to be consistent with usage following the jump target */
-          copy = (char *) alloca (p - saved_arg2 + 1);
-          memcpy (copy, saved_arg2, p - saved_arg2);
-          /* Note: if is_quoted should be true, we snuff out quote here anyway */
-          copy[p-saved_arg2] = '\000'; 
-          /* Set argptr to skip over the name */
-          *argptr = (*p == '\'') ? p + 1 : p;
-          /* Look up entire name */
-          sym = lookup_symbol (copy, 0, VAR_NAMESPACE, 0, &sym_symtab);
-          s = (struct symtab *) 0;
-          /* Prepare to jump: restore the " if (condition)" so outer layers see it */
-          /* Symbol was found --> jump to normal symbol processing.
-             Code following "symbol_found" expects "copy" to have the
-             symbol name, "sym" to have the symbol pointer, "s" to be
-             a specified file's symtab, and sym_symtab to be the symbol's
-             symtab. */
-          /* By jumping there we avoid falling through the FILE:LINE and
-             FILE:FUNC processing stuff below */
-          if (sym)
-            goto symbol_found;
-
-          /* Couldn't find any interpretation as classes/namespaces, so give up */
-          error_begin ();
-          /* The quotes are important if copy is empty.  */
-          printf_filtered
-            ("Can't find member of namespace, class, struct, or union named \"%s\"\n", copy);
-          cplusplus_hint (saved_arg);
-          return_to_top_level (RETURN_ERROR);
-        }
+
+	      /* Move pointer up to next possible class/namespace token */
+	      p = p2 + 1;	/* restart with old value +1 */
+	      /* Move pointer ahead to next double-colon */
+	      while (*p && (p[0] != ' ') && (p[0] != '\t') && (p[0] != '\''))
+		{
+		  if (p[0] == '<')
+		    {
+		      temp_end = find_template_name_end (p);
+		      if (!temp_end)
+			error ("malformed template specification in command");
+		      p = temp_end;
+		    }
+		  else if ((p[0] == ':') && (p[1] == ':'))
+		    break;	/* found double-colon */
+		  else
+		    p++;
+		}
+
+	      if (*p != ':')
+		break;		/* out of the while (1) */
+
+	      p2 = p;		/* save restart for next time around */
+	      *argptr = saved_arg2;	/* restore argptr */
+	    }			/* while (1) */
+
+	  /* Last chance attempt -- check entire name as a symbol */
+	  /* Use "copy" in preparation for jumping out of this block,
+	     to be consistent with usage following the jump target */
+	  copy = (char *) alloca (p - saved_arg2 + 1);
+	  memcpy (copy, saved_arg2, p - saved_arg2);
+	  /* Note: if is_quoted should be true, we snuff out quote here anyway */
+	  copy[p - saved_arg2] = '\000';
+	  /* Set argptr to skip over the name */
+	  *argptr = (*p == '\'') ? p + 1 : p;
+	  /* Look up entire name */
+	  sym = lookup_symbol (copy, 0, VAR_NAMESPACE, 0, &sym_symtab);
+	  s = (struct symtab *) 0;
+	  /* Prepare to jump: restore the " if (condition)" so outer layers see it */
+	  /* Symbol was found --> jump to normal symbol processing.
+	     Code following "symbol_found" expects "copy" to have the
+	     symbol name, "sym" to have the symbol pointer, "s" to be
+	     a specified file's symtab, and sym_symtab to be the symbol's
+	     symtab. */
+	  /* By jumping there we avoid falling through the FILE:LINE and
+	     FILE:FUNC processing stuff below */
+	  if (sym)
+	    goto symbol_found;
+
+	  /* Couldn't find any interpretation as classes/namespaces, so give up */
+	  error_begin ();
+	  /* The quotes are important if copy is empty.  */
+	  printf_filtered
+	    ("Can't find member of namespace, class, struct, or union named \"%s\"\n", copy);
+	  cplusplus_hint (saved_arg);
+	  return_to_top_level (RETURN_ERROR);
+	}
       /*  end of C++  */
 
 
       /* Extract the file name.  */
       p1 = p;
-      while (p != *argptr && p[-1] == ' ') --p;
-      if ((*p == '"') && is_quote_enclosed) --p;
+      while (p != *argptr && p[-1] == ' ')
+	--p;
+      if ((*p == '"') && is_quote_enclosed)
+	--p;
       copy = (char *) alloca (p - *argptr + 1);
       if ((**argptr == '"') && is_quote_enclosed)
-        {
-          memcpy (copy, *argptr + 1, p - *argptr - 1);
-          /* It may have the ending quote right after the file name */
-          if (copy[p - *argptr - 2] == '"')
-            copy[p - *argptr - 2] = 0;
-          else
-            copy[p - *argptr - 1] = 0;
-        }
+	{
+	  memcpy (copy, *argptr + 1, p - *argptr - 1);
+	  /* It may have the ending quote right after the file name */
+	  if (copy[p - *argptr - 2] == '"')
+	    copy[p - *argptr - 2] = 0;
+	  else
+	    copy[p - *argptr - 1] = 0;
+	}
       else
-        {
-          memcpy (copy, *argptr, p - *argptr);
-          copy[p - *argptr] = 0;
-        }
+	{
+	  memcpy (copy, *argptr, p - *argptr);
+	  copy[p - *argptr] = 0;
+	}
 
       /* Find that file's data.  */
       s = lookup_symtab (copy);
@@ -2905,7 +2923,8 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical)
 
       /* Discard the file name from the arg.  */
       p = p1 + 1;
-      while (*p == ' ' || *p == '\t') p++;
+      while (*p == ' ' || *p == '\t')
+	p++;
       *argptr = p;
     }
 #if 0
@@ -2916,32 +2935,34 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical)
      example, you are setting a breakpoint at this function),
      you get an error. This did not occur with earlier
      verions, so I am ifdef'ing this out. 3/29/99 */
-  else {
-    /* Check if what we have till now is a symbol name */
-
-    /* We may be looking at a template instantiation such
-       as "foo<int>".  Check here whether we know about it,
-       instead of falling through to the code below which
-       handles ordinary function names, because that code
-       doesn't like seeing '<' and '>' in a name -- the
-       skip_quoted call doesn't go past them.  So see if we
-       can figure it out right now. */ 
-
-    copy = (char *) alloca (p - *argptr + 1);
-    memcpy (copy, *argptr, p - *argptr);
-    copy[p - *argptr] = '\000';
-    sym = lookup_symbol (copy, 0, VAR_NAMESPACE, 0, &sym_symtab);
-    if (sym) {
-      /* Yes, we have a symbol; jump to symbol processing */
-      /* Code after symbol_found expects S, SYM_SYMTAB, SYM, 
-         and COPY to be set correctly */ 
-      *argptr = (*p == '\'') ? p + 1 : p;
-      s = (struct symtab *) 0;
-      goto symbol_found;
+  else
+    {
+      /* Check if what we have till now is a symbol name */
+
+      /* We may be looking at a template instantiation such
+         as "foo<int>".  Check here whether we know about it,
+         instead of falling through to the code below which
+         handles ordinary function names, because that code
+         doesn't like seeing '<' and '>' in a name -- the
+         skip_quoted call doesn't go past them.  So see if we
+         can figure it out right now. */
+
+      copy = (char *) alloca (p - *argptr + 1);
+      memcpy (copy, *argptr, p - *argptr);
+      copy[p - *argptr] = '\000';
+      sym = lookup_symbol (copy, 0, VAR_NAMESPACE, 0, &sym_symtab);
+      if (sym)
+	{
+	  /* Yes, we have a symbol; jump to symbol processing */
+	  /* Code after symbol_found expects S, SYM_SYMTAB, SYM, 
+	     and COPY to be set correctly */
+	  *argptr = (*p == '\'') ? p + 1 : p;
+	  s = (struct symtab *) 0;
+	  goto symbol_found;
+	}
+      /* Otherwise fall out from here and go to file/line spec
+         processing, etc. */
     }
-    /* Otherwise fall out from here and go to file/line spec
-       processing, etc. */ 
-  }
 #endif
 
   /* S is specified file's symtab, or 0 if no file specified.
@@ -2950,22 +2971,27 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical)
   /* Check whether arg is all digits (and sign) */
 
   q = *argptr;
-  if (*q == '-' || *q == '+') q++;
+  if (*q == '-' || *q == '+')
+    q++;
   while (*q >= '0' && *q <= '9')
     q++;
 
   if (q != *argptr && (*q == 0 || *q == ' ' || *q == '\t' || *q == ','))
     {
       /* We found a token consisting of all digits -- at least one digit.  */
-      enum sign {none, plus, minus} sign = none;
+      enum sign
+	{
+	  none, plus, minus
+	}
+      sign = none;
 
       /* We might need a canonical line spec if no file was specified.  */
       int need_canonical = (s == 0) ? 1 : 0;
 
       /* This is where we need to make sure that we have good defaults.
-	 We must guarantee that this section of code is never executed
-	 when we are called with just a function name, since
-	 select_source_symtab calls us with such an argument  */
+         We must guarantee that this section of code is never executed
+         when we are called with just a function name, since
+         select_source_symtab calls us with such an argument  */
 
       if (s == 0 && default_symtab == 0)
 	{
@@ -2996,21 +3022,22 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical)
 	    val.line = 1;
 	  break;
 	case none:
-	  break;	/* No need to adjust val.line.  */
+	  break;		/* No need to adjust val.line.  */
 	}
 
-      while (*q == ' ' || *q == '\t') q++;
+      while (*q == ' ' || *q == '\t')
+	q++;
       *argptr = q;
       if (s == 0)
 	s = default_symtab;
 
       /* It is possible that this source file has more than one symtab, 
-	 and that the new line number specification has moved us from the
-	 default (in s) to a new one.  */
+         and that the new line number specification has moved us from the
+         default (in s) to a new one.  */
       val.symtab = find_line_symtab (s, val.line, NULL, NULL);
       if (val.symtab == 0)
 	val.symtab = s;
-     
+
       val.pc = 0;
       values.sals = (struct symtab_and_line *)
 	xmalloc (sizeof (struct symtab_and_line));
@@ -3025,20 +3052,20 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical)
      Find the next token (everything up to end or next whitespace).  */
 
   if (**argptr == '$')		/* May be a convenience variable */
-    p = skip_quoted (*argptr + (((*argptr)[1] == '$') ? 2 : 1));  /* One or two $ chars possible */
+    p = skip_quoted (*argptr + (((*argptr)[1] == '$') ? 2 : 1));	/* One or two $ chars possible */
   else if (is_quoted)
     {
       p = skip_quoted (*argptr);
       if (p[-1] != '\'')
-        error ("Unmatched single quote.");
+	error ("Unmatched single quote.");
     }
   else if (has_parens)
     {
-      p = pp+1;
+      p = pp + 1;
     }
-  else 
+  else
     {
-      p = skip_quoted(*argptr);
+      p = skip_quoted (*argptr);
     }
 
   copy = (char *) alloca (p - *argptr + 1);
@@ -3046,18 +3073,19 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical)
   copy[p - *argptr] = '\0';
   if (p != *argptr
       && copy[0]
-      && copy[0] == copy [p - *argptr - 1]
+      && copy[0] == copy[p - *argptr - 1]
       && strchr (gdb_completer_quote_characters, copy[0]) != NULL)
     {
-      copy [p - *argptr - 1] = '\0';
+      copy[p - *argptr - 1] = '\0';
       copy++;
     }
-  while (*p == ' ' || *p == '\t') p++;
+  while (*p == ' ' || *p == '\t')
+    p++;
   *argptr = p;
 
   /* If it starts with $: may be a legitimate variable or routine name
      (e.g. HP-UX millicode routines such as $$dyncall), or it may
-     be history value, or it may be a convenience variable */ 
+     be history value, or it may be a convenience variable */
 
   if (*copy == '$')
     {
@@ -3067,51 +3095,51 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical)
 
       p = (copy[1] == '$') ? copy + 2 : copy + 1;
       while (*p >= '0' && *p <= '9')
-        p++;
-      if (!*p) /* reached end of token without hitting non-digit */
-        {
-          /* We have a value history reference */
-          sscanf ((copy[1] == '$') ? copy + 2 : copy + 1, "%d", &index);
-          valx = access_value_history ((copy[1] == '$') ? -index : index);
-          if (TYPE_CODE (VALUE_TYPE (valx)) != TYPE_CODE_INT)
-            error ("History values used in line specs must have integer values.");
-        }
-      else 
-        {
-          /* Not all digits -- may be user variable/function or a
-              convenience variable */
-          
-          /* Look up entire name as a symbol first */
-          sym = lookup_symbol (copy, 0, VAR_NAMESPACE, 0, &sym_symtab); 
-          s = (struct symtab *) 0;
-          need_canonical = 1;
-          /* Symbol was found --> jump to normal symbol processing.
-             Code following "symbol_found" expects "copy" to have the
-             symbol name, "sym" to have the symbol pointer, "s" to be
-             a specified file's symtab, and sym_symtab to be the symbol's
-             symtab. */
-          if (sym)
-            goto symbol_found;
-
-          /* If symbol was not found, look in minimal symbol tables */ 
-          msymbol = lookup_minimal_symbol (copy, 0, 0);
-          /* Min symbol was found --> jump to minsym processing. */ 
-          if (msymbol)
-            goto minimal_symbol_found;
-          
-          /* Not a user variable or function -- must be convenience variable */
-          need_canonical = (s == 0) ? 1 : 0;
-          valx = value_of_internalvar (lookup_internalvar (copy + 1));
-          if (TYPE_CODE (VALUE_TYPE (valx)) != TYPE_CODE_INT)
-            error ("Convenience variables used in line specs must have integer values.");
-        }
-
-      /* Either history value or convenience value from above, in valx */ 
+	p++;
+      if (!*p)			/* reached end of token without hitting non-digit */
+	{
+	  /* We have a value history reference */
+	  sscanf ((copy[1] == '$') ? copy + 2 : copy + 1, "%d", &index);
+	  valx = access_value_history ((copy[1] == '$') ? -index : index);
+	  if (TYPE_CODE (VALUE_TYPE (valx)) != TYPE_CODE_INT)
+	    error ("History values used in line specs must have integer values.");
+	}
+      else
+	{
+	  /* Not all digits -- may be user variable/function or a
+	     convenience variable */
+
+	  /* Look up entire name as a symbol first */
+	  sym = lookup_symbol (copy, 0, VAR_NAMESPACE, 0, &sym_symtab);
+	  s = (struct symtab *) 0;
+	  need_canonical = 1;
+	  /* Symbol was found --> jump to normal symbol processing.
+	     Code following "symbol_found" expects "copy" to have the
+	     symbol name, "sym" to have the symbol pointer, "s" to be
+	     a specified file's symtab, and sym_symtab to be the symbol's
+	     symtab. */
+	  if (sym)
+	    goto symbol_found;
+
+	  /* If symbol was not found, look in minimal symbol tables */
+	  msymbol = lookup_minimal_symbol (copy, 0, 0);
+	  /* Min symbol was found --> jump to minsym processing. */
+	  if (msymbol)
+	    goto minimal_symbol_found;
+
+	  /* Not a user variable or function -- must be convenience variable */
+	  need_canonical = (s == 0) ? 1 : 0;
+	  valx = value_of_internalvar (lookup_internalvar (copy + 1));
+	  if (TYPE_CODE (VALUE_TYPE (valx)) != TYPE_CODE_INT)
+	    error ("Convenience variables used in line specs must have integer values.");
+	}
+
+      /* Either history value or convenience value from above, in valx */
       val.symtab = s ? s : default_symtab;
       val.line = value_as_long (valx);
       val.pc = 0;
 
-      values.sals = (struct symtab_and_line *)xmalloc (sizeof val);
+      values.sals = (struct symtab_and_line *) xmalloc (sizeof val);
       values.sals[0] = val;
       values.nelts = 1;
 
@@ -3129,9 +3157,9 @@ decode_line_1 (argptr, funfirstline, default_symtab, default_line, canonical)
 		       (s ? BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), STATIC_BLOCK)
 			: get_selected_block ()),
 		       VAR_NAMESPACE, 0, &sym_symtab);
-  
-symbol_found:   /* We also jump here from inside the C++ class/namespace 
-                   code on finding a symbol of the form "A::B::C" */
+
+symbol_found:			/* We also jump here from inside the C++ class/namespace 
+				   code on finding a symbol of the form "A::B::C" */
 
   if (sym != NULL)
     {
@@ -3185,15 +3213,15 @@ symbol_found:   /* We also jump here from inside the C++ class/namespace
 
   msymbol = lookup_minimal_symbol (copy, NULL, NULL);
 
-minimal_symbol_found: /* We also jump here from the case for variables
-                         that begin with '$' */
-  
+minimal_symbol_found:		/* We also jump here from the case for variables
+				   that begin with '$' */
+
   if (msymbol != NULL)
     {
       values.sals = (struct symtab_and_line *)
 	xmalloc (sizeof (struct symtab_and_line));
-      values.sals[0] = find_pc_sect_line ( SYMBOL_VALUE_ADDRESS (msymbol), 
-					   (struct sec *)0,0 );
+      values.sals[0] = find_pc_sect_line (SYMBOL_VALUE_ADDRESS (msymbol),
+					  (struct sec *) 0, 0);
       values.sals[0].section = SYMBOL_BFD_SECTION (msymbol);
       if (funfirstline)
 	{
@@ -3209,7 +3237,7 @@ minimal_symbol_found: /* We also jump here from the case for variables
     error (no_symtab_msg);
 
   error ("Function \"%s\" not defined.", copy);
-  return values;	/* for lint */
+  return values;		/* for lint */
 }
 
 struct symtabs_and_lines
@@ -3222,7 +3250,7 @@ decode_line_spec (string, funfirstline)
     error ("Empty line specification.");
   sals = decode_line_1 (&string, funfirstline,
 			current_source_symtab, current_source_line,
-			(char ***)NULL);
+			(char ***) NULL);
   if (*string)
     error ("Junk at end of line specification: %s", string);
   return sals;
@@ -3246,12 +3274,12 @@ decode_line_2 (sym_arr, nelts, funfirstline, canonical)
   char *prompt;
   char *symname;
   struct cleanup *old_chain;
-  char **canonical_arr = (char **)NULL;
+  char **canonical_arr = (char **) NULL;
 
-  values.sals = (struct symtab_and_line *) 
-    alloca (nelts * sizeof(struct symtab_and_line));
-  return_values.sals = (struct symtab_and_line *) 
-    xmalloc (nelts * sizeof(struct symtab_and_line));
+  values.sals = (struct symtab_and_line *)
+    alloca (nelts * sizeof (struct symtab_and_line));
+  return_values.sals = (struct symtab_and_line *)
+    xmalloc (nelts * sizeof (struct symtab_and_line));
   old_chain = make_cleanup (free, return_values.sals);
 
   if (canonical)
@@ -3263,7 +3291,7 @@ decode_line_2 (sym_arr, nelts, funfirstline, canonical)
     }
 
   i = 0;
-  printf_unfiltered("[0] cancel\n[1] all\n");
+  printf_unfiltered ("[0] cancel\n[1] all\n");
   while (i < nelts)
     {
       INIT_SAL (&return_values.sals[i]);	/* initialize to zeroes */
@@ -3272,7 +3300,7 @@ decode_line_2 (sym_arr, nelts, funfirstline, canonical)
 	{
 	  values.sals[i] = find_function_start_sal (sym_arr[i], funfirstline);
 	  printf_unfiltered ("[%d] %s at %s:%d\n",
-			     (i+2),
+			     (i + 2),
 			     SYMBOL_SOURCE_NAME (sym_arr[i]),
 			     values.sals[i].symtab->filename,
 			     values.sals[i].line);
@@ -3281,13 +3309,13 @@ decode_line_2 (sym_arr, nelts, funfirstline, canonical)
 	printf_unfiltered ("?HERE\n");
       i++;
     }
-  
+
   if ((prompt = getenv ("PS2")) == NULL)
     {
       prompt = "> ";
     }
   args = command_line_input (prompt, 0, "overload-choice");
-  
+
   if (args == 0 || *args == 0)
     error_no_arg ("one or more choice numbers");
 
@@ -3297,7 +3325,8 @@ decode_line_2 (sym_arr, nelts, funfirstline, canonical)
       int num;
 
       arg1 = args;
-      while (*arg1 >= '0' && *arg1 <= '9') arg1++;
+      while (*arg1 >= '0' && *arg1 <= '9')
+	arg1++;
       if (*arg1 && *arg1 != ' ' && *arg1 != '\t')
 	error ("Arguments must be choice numbers.");
 
@@ -3311,15 +3340,15 @@ decode_line_2 (sym_arr, nelts, funfirstline, canonical)
 	    {
 	      for (i = 0; i < nelts; i++)
 		{
-	          if (canonical_arr[i] == NULL)
+		  if (canonical_arr[i] == NULL)
 		    {
 		      symname = SYMBOL_NAME (sym_arr[i]);
-	              canonical_arr[i] = savestring (symname, strlen (symname));
+		      canonical_arr[i] = savestring (symname, strlen (symname));
 		    }
 		}
 	    }
 	  memcpy (return_values.sals, values.sals,
-		  (nelts * sizeof(struct symtab_and_line)));
+		  (nelts * sizeof (struct symtab_and_line)));
 	  return_values.nelts = nelts;
 	  discard_cleanups (old_chain);
 	  return return_values;
@@ -3350,14 +3379,15 @@ decode_line_2 (sym_arr, nelts, funfirstline, canonical)
 	}
 
       args = arg1;
-      while (*args == ' ' || *args == '\t') args++;
+      while (*args == ' ' || *args == '\t')
+	args++;
     }
   return_values.nelts = i;
   discard_cleanups (old_chain);
   return return_values;
 }
-
 
+
 /* Slave routine for sources_info.  Force line breaks at ,'s.
    NAME is the name to print and *FIRST is nonzero if this is the first
    name printed.  Set *FIRST to zero.  */
@@ -3415,7 +3445,7 @@ output_source_filename (name, first)
 
   wrap_here ("");
   fputs_filtered (name, gdb_stdout);
-}  
+}
 
 static void
 sources_info (ignore, from_tty)
@@ -3426,31 +3456,31 @@ sources_info (ignore, from_tty)
   register struct partial_symtab *ps;
   register struct objfile *objfile;
   int first;
-  
+
   if (!have_full_symbols () && !have_partial_symbols ())
     {
       error (no_symtab_msg);
     }
-  
+
   printf_filtered ("Source files for which symbols have been read in:\n\n");
 
   first = 1;
   ALL_SYMTABS (objfile, s)
-    {
-      output_source_filename (s -> filename, &first);
-    }
+  {
+    output_source_filename (s->filename, &first);
+  }
   printf_filtered ("\n\n");
-  
+
   printf_filtered ("Source files for which symbols will be read in on demand:\n\n");
 
   first = 1;
   ALL_PSYMTABS (objfile, ps)
-    {
-      if (!ps->readin)
-	{
-	  output_source_filename (ps -> filename, &first);
-	}
-    }
+  {
+    if (!ps->readin)
+      {
+	output_source_filename (ps->filename, &first);
+      }
+  }
   printf_filtered ("\n");
 }
 
@@ -3465,10 +3495,10 @@ file_matches (file, files, nfiles)
   if (file != NULL && nfiles != 0)
     {
       for (i = 0; i < nfiles; i++)
-        {
-          if (strcmp (files[i], basename (file)) == 0)
-            return 1;
-        }
+	{
+	  if (strcmp (files[i], basename (file)) == 0)
+	    return 1;
+	}
     }
   else if (nfiles == 0)
     return 1;
@@ -3494,14 +3524,14 @@ free_search_symbols (symbols)
    returning the results in *MATCHES.
 
    Only symbols of KIND are searched:
-     FUNCTIONS_NAMESPACE - search all functions
-     TYPES_NAMESPACE     - search all type names
-     METHODS_NAMESPACE   - search all methods NOT IMPLEMENTED
-     VARIABLES_NAMESPACE - search all symbols, excluding functions, type names,
-                         and constants (enums)
+   FUNCTIONS_NAMESPACE - search all functions
+   TYPES_NAMESPACE     - search all type names
+   METHODS_NAMESPACE   - search all methods NOT IMPLEMENTED
+   VARIABLES_NAMESPACE - search all symbols, excluding functions, type names,
+   and constants (enums)
 
    free_search_symbols should be called when *MATCHES is no longer needed.
-*/
+ */
 void
 search_symbols (regexp, kind, nfiles, files, matches)
      char *regexp;
@@ -3509,7 +3539,7 @@ search_symbols (regexp, kind, nfiles, files, matches)
      int nfiles;
      char *files[];
      struct symbol_search **matches;
-     
+
 {
   register struct symtab *s;
   register struct partial_symtab *ps;
@@ -3525,13 +3555,17 @@ search_symbols (regexp, kind, nfiles, files, matches)
   char *val;
   int found_misc = 0;
   static enum minimal_symbol_type types[]
-    = {mst_data, mst_text, mst_abs, mst_unknown};
+  =
+  {mst_data, mst_text, mst_abs, mst_unknown};
   static enum minimal_symbol_type types2[]
-    = {mst_bss,  mst_file_text, mst_abs, mst_unknown};
+  =
+  {mst_bss, mst_file_text, mst_abs, mst_unknown};
   static enum minimal_symbol_type types3[]
-    = {mst_file_data,  mst_solib_trampoline, mst_abs, mst_unknown};
+  =
+  {mst_file_data, mst_solib_trampoline, mst_abs, mst_unknown};
   static enum minimal_symbol_type types4[]
-    = {mst_file_bss,   mst_text, mst_abs, mst_unknown};
+  =
+  {mst_file_bss, mst_text, mst_abs, mst_unknown};
   enum minimal_symbol_type ourtype;
   enum minimal_symbol_type ourtype2;
   enum minimal_symbol_type ourtype3;
@@ -3561,31 +3595,31 @@ search_symbols (regexp, kind, nfiles, files, matches)
       char *opend;
       char *opname = operator_chars (regexp, &opend);
       if (*opname)
-        {
-          int fix = -1; /* -1 means ok; otherwise number of spaces needed. */
-          if (isalpha(*opname) || *opname == '_' || *opname == '$')
-            {
-              /* There should 1 space between 'operator' and 'TYPENAME'. */
-              if (opname[-1] != ' ' || opname[-2] == ' ')
-                fix = 1;
-            }
-          else
-            {
-              /* There should 0 spaces between 'operator' and 'OPERATOR'. */
-              if (opname[-1] == ' ')
-                fix = 0;
-            }
-          /* If wrong number of spaces, fix it. */
-          if (fix >= 0)
-            {
-              char *tmp = (char*) alloca(opend-opname+10);
-              sprintf(tmp, "operator%.*s%s", fix, " ", opname);
-              regexp = tmp;
-            }
-        }
-      
+	{
+	  int fix = -1;		/* -1 means ok; otherwise number of spaces needed. */
+	  if (isalpha (*opname) || *opname == '_' || *opname == '$')
+	    {
+	      /* There should 1 space between 'operator' and 'TYPENAME'. */
+	      if (opname[-1] != ' ' || opname[-2] == ' ')
+		fix = 1;
+	    }
+	  else
+	    {
+	      /* There should 0 spaces between 'operator' and 'OPERATOR'. */
+	      if (opname[-1] == ' ')
+		fix = 0;
+	    }
+	  /* If wrong number of spaces, fix it. */
+	  if (fix >= 0)
+	    {
+	      char *tmp = (char *) alloca (opend - opname + 10);
+	      sprintf (tmp, "operator%.*s%s", fix, " ", opname);
+	      regexp = tmp;
+	    }
+	}
+
       if (0 != (val = re_comp (regexp)))
-        error ("Invalid regexp (%s): %s", val, regexp);
+	error ("Invalid regexp (%s): %s", val, regexp);
     }
 
   /* Search through the partial symtabs *first* for all symbols
@@ -3593,53 +3627,54 @@ search_symbols (regexp, kind, nfiles, files, matches)
      the machinery below. */
 
   ALL_PSYMTABS (objfile, ps)
-    {
-      struct partial_symbol **bound, **gbound, **sbound;
-      int keep_going = 1;
-
-      if (ps->readin) continue;
-
-      gbound = objfile->global_psymbols.list + ps->globals_offset + ps->n_global_syms;
-      sbound = objfile->static_psymbols.list + ps->statics_offset + ps->n_static_syms;
-      bound = gbound;
-      
-      /* Go through all of the symbols stored in a partial
-         symtab in one loop. */
-      psym = objfile->global_psymbols.list + ps->globals_offset;
-      while (keep_going)
-        {
-          if (psym >= bound)
-            {
-              if (bound == gbound && ps->n_static_syms != 0)
-                {
-                  psym = objfile->static_psymbols.list + ps->statics_offset;
-                  bound = sbound;
-                }
-              else
-                keep_going = 0;
-              continue;
-            }
-          else
-            {
-              QUIT;
-
-              /* If it would match (logic taken from loop below)
-                 load the file and go on to the next one */
-              if (file_matches (ps->filename, files, nfiles)
-                  && ((regexp == NULL || SYMBOL_MATCHES_REGEXP (*psym))
-                      && ((kind == VARIABLES_NAMESPACE && SYMBOL_CLASS (*psym) != LOC_TYPEDEF
-                           && SYMBOL_CLASS (*psym) != LOC_BLOCK)
-                          || (kind == FUNCTIONS_NAMESPACE && SYMBOL_CLASS (*psym) == LOC_BLOCK)
-                          || (kind == TYPES_NAMESPACE && SYMBOL_CLASS (*psym) == LOC_TYPEDEF)
-                          || (kind == METHODS_NAMESPACE && SYMBOL_CLASS (*psym) == LOC_BLOCK))))
-                {
-                  PSYMTAB_TO_SYMTAB(ps);
-                  keep_going = 0;
-                }
-            }
-          psym++;
-        }
-    }
+  {
+    struct partial_symbol **bound, **gbound, **sbound;
+    int keep_going = 1;
+
+    if (ps->readin)
+      continue;
+
+    gbound = objfile->global_psymbols.list + ps->globals_offset + ps->n_global_syms;
+    sbound = objfile->static_psymbols.list + ps->statics_offset + ps->n_static_syms;
+    bound = gbound;
+
+    /* Go through all of the symbols stored in a partial
+       symtab in one loop. */
+    psym = objfile->global_psymbols.list + ps->globals_offset;
+    while (keep_going)
+      {
+	if (psym >= bound)
+	  {
+	    if (bound == gbound && ps->n_static_syms != 0)
+	      {
+		psym = objfile->static_psymbols.list + ps->statics_offset;
+		bound = sbound;
+	      }
+	    else
+	      keep_going = 0;
+	    continue;
+	  }
+	else
+	  {
+	    QUIT;
+
+	    /* If it would match (logic taken from loop below)
+	       load the file and go on to the next one */
+	    if (file_matches (ps->filename, files, nfiles)
+		&& ((regexp == NULL || SYMBOL_MATCHES_REGEXP (*psym))
+		    && ((kind == VARIABLES_NAMESPACE && SYMBOL_CLASS (*psym) != LOC_TYPEDEF
+			 && SYMBOL_CLASS (*psym) != LOC_BLOCK)
+			|| (kind == FUNCTIONS_NAMESPACE && SYMBOL_CLASS (*psym) == LOC_BLOCK)
+			|| (kind == TYPES_NAMESPACE && SYMBOL_CLASS (*psym) == LOC_TYPEDEF)
+			|| (kind == METHODS_NAMESPACE && SYMBOL_CLASS (*psym) == LOC_BLOCK))))
+	      {
+		PSYMTAB_TO_SYMTAB (ps);
+		keep_going = 0;
+	      }
+	  }
+	psym++;
+      }
+  }
 
   /* Here, we search through the minimal symbol tables for functions
      and variables that match, and force their symbols to be read.
@@ -3652,82 +3687,82 @@ search_symbols (regexp, kind, nfiles, files, matches)
      to determine if the variable has debug info.
      If the lookup fails, set found_misc so that we will rescan to print
      any matching symbols without debug info.
-  */
+   */
 
   if (nfiles == 0 && (kind == VARIABLES_NAMESPACE || kind == FUNCTIONS_NAMESPACE))
     {
       ALL_MSYMBOLS (objfile, msymbol)
-        {
-          if (MSYMBOL_TYPE (msymbol) == ourtype ||
-              MSYMBOL_TYPE (msymbol) == ourtype2 ||
-              MSYMBOL_TYPE (msymbol) == ourtype3 ||
-              MSYMBOL_TYPE (msymbol) == ourtype4)
-            {
-              if (regexp == NULL || SYMBOL_MATCHES_REGEXP (msymbol))
-                {
-                  if (0 == find_pc_symtab (SYMBOL_VALUE_ADDRESS (msymbol)))
-                    {
-                      if (kind == FUNCTIONS_NAMESPACE
-                          || lookup_symbol (SYMBOL_NAME (msymbol), 
-                                            (struct block *) NULL,
-                                            VAR_NAMESPACE,
-                                            0, (struct symtab **) NULL) == NULL)
-                        found_misc = 1;
-                    }
-                }
-            }
-        }
+      {
+	if (MSYMBOL_TYPE (msymbol) == ourtype ||
+	    MSYMBOL_TYPE (msymbol) == ourtype2 ||
+	    MSYMBOL_TYPE (msymbol) == ourtype3 ||
+	    MSYMBOL_TYPE (msymbol) == ourtype4)
+	  {
+	    if (regexp == NULL || SYMBOL_MATCHES_REGEXP (msymbol))
+	      {
+		if (0 == find_pc_symtab (SYMBOL_VALUE_ADDRESS (msymbol)))
+		  {
+		    if (kind == FUNCTIONS_NAMESPACE
+			|| lookup_symbol (SYMBOL_NAME (msymbol),
+					  (struct block *) NULL,
+					  VAR_NAMESPACE,
+					0, (struct symtab **) NULL) == NULL)
+		      found_misc = 1;
+		  }
+	      }
+	  }
+      }
     }
 
   ALL_SYMTABS (objfile, s)
-    {
-      bv = BLOCKVECTOR (s);
-      /* Often many files share a blockvector.
-         Scan each blockvector only once so that
-         we don't get every symbol many times.
-         It happens that the first symtab in the list
-         for any given blockvector is the main file.  */
-      if (bv != prev_bv)
-        for (i = GLOBAL_BLOCK; i <= STATIC_BLOCK; i++)
-          {
-            b = BLOCKVECTOR_BLOCK (bv, i);
-            /* Skip the sort if this block is always sorted.  */
-            if (!BLOCK_SHOULD_SORT (b))
-              sort_block_syms (b);
-            for (j = 0; j < BLOCK_NSYMS (b); j++)
-              {
-                QUIT;
-                sym = BLOCK_SYM (b, j);
-                if (file_matches (s->filename, files, nfiles)
-                    && ((regexp == NULL || SYMBOL_MATCHES_REGEXP (sym))
-                        && ((kind == VARIABLES_NAMESPACE && SYMBOL_CLASS (sym) != LOC_TYPEDEF
-                             && SYMBOL_CLASS (sym) != LOC_BLOCK
-                             && SYMBOL_CLASS (sym) != LOC_CONST)
-                            || (kind == FUNCTIONS_NAMESPACE && SYMBOL_CLASS (sym) == LOC_BLOCK)
-                            || (kind == TYPES_NAMESPACE && SYMBOL_CLASS (sym) == LOC_TYPEDEF)
-                            || (kind == METHODS_NAMESPACE && SYMBOL_CLASS (sym) == LOC_BLOCK))))
-                  {
-                    /* match */
-                    psr = (struct symbol_search *) xmalloc (sizeof (struct symbol_search));
-                    psr->block = i;
-                    psr->symtab = s;
-                    psr->symbol = sym;
-                    psr->msymbol = NULL;
-                    psr->next = NULL;
-                    if (tail == NULL)
-                      {
-                        sr = psr;
-                        old_chain = make_cleanup ((make_cleanup_func) 
-                                                  free_search_symbols, sr);
-                      }
-                    else
-                      tail->next = psr;
-                    tail = psr;
-                  }
-              }
-          }
-      prev_bv = bv;
-    }
+  {
+    bv = BLOCKVECTOR (s);
+    /* Often many files share a blockvector.
+       Scan each blockvector only once so that
+       we don't get every symbol many times.
+       It happens that the first symtab in the list
+       for any given blockvector is the main file.  */
+    if (bv != prev_bv)
+      for (i = GLOBAL_BLOCK; i <= STATIC_BLOCK; i++)
+	{
+	  b = BLOCKVECTOR_BLOCK (bv, i);
+	  /* Skip the sort if this block is always sorted.  */
+	  if (!BLOCK_SHOULD_SORT (b))
+	    sort_block_syms (b);
+	  for (j = 0; j < BLOCK_NSYMS (b); j++)
+	    {
+	      QUIT;
+	      sym = BLOCK_SYM (b, j);
+	      if (file_matches (s->filename, files, nfiles)
+		  && ((regexp == NULL || SYMBOL_MATCHES_REGEXP (sym))
+		      && ((kind == VARIABLES_NAMESPACE && SYMBOL_CLASS (sym) != LOC_TYPEDEF
+			   && SYMBOL_CLASS (sym) != LOC_BLOCK
+			   && SYMBOL_CLASS (sym) != LOC_CONST)
+			  || (kind == FUNCTIONS_NAMESPACE && SYMBOL_CLASS (sym) == LOC_BLOCK)
+			  || (kind == TYPES_NAMESPACE && SYMBOL_CLASS (sym) == LOC_TYPEDEF)
+			  || (kind == METHODS_NAMESPACE && SYMBOL_CLASS (sym) == LOC_BLOCK))))
+		{
+		  /* match */
+		  psr = (struct symbol_search *) xmalloc (sizeof (struct symbol_search));
+		  psr->block = i;
+		  psr->symtab = s;
+		  psr->symbol = sym;
+		  psr->msymbol = NULL;
+		  psr->next = NULL;
+		  if (tail == NULL)
+		    {
+		      sr = psr;
+		      old_chain = make_cleanup ((make_cleanup_func)
+						free_search_symbols, sr);
+		    }
+		  else
+		    tail->next = psr;
+		  tail = psr;
+		}
+	    }
+	}
+    prev_bv = bv;
+  }
 
   /* If there are no eyes, avoid all contact.  I mean, if there are
      no debug symbols, then print directly from the msymbol_vector.  */
@@ -3735,44 +3770,44 @@ search_symbols (regexp, kind, nfiles, files, matches)
   if (found_misc || kind != FUNCTIONS_NAMESPACE)
     {
       ALL_MSYMBOLS (objfile, msymbol)
-        {
-          if (MSYMBOL_TYPE (msymbol) == ourtype ||
-              MSYMBOL_TYPE (msymbol) == ourtype2 ||
-              MSYMBOL_TYPE (msymbol) == ourtype3 ||
-              MSYMBOL_TYPE (msymbol) == ourtype4)
-            {
-              if (regexp == NULL || SYMBOL_MATCHES_REGEXP (msymbol))
-                {
-                  /* Functions:  Look up by address. */
-                  if (kind != FUNCTIONS_NAMESPACE ||
-                      (0 == find_pc_symtab (SYMBOL_VALUE_ADDRESS (msymbol))))
-                    {
-                      /* Variables/Absolutes:  Look up by name */
-                      if (lookup_symbol (SYMBOL_NAME (msymbol), 
-                                         (struct block *) NULL, VAR_NAMESPACE,
-                                         0, (struct symtab **) NULL) == NULL)
-                        {
-                          /* match */
-                          psr = (struct symbol_search *) xmalloc (sizeof (struct symbol_search));
-                          psr->block = i;
-                          psr->msymbol = msymbol;
-                          psr->symtab  = NULL;
-                          psr->symbol  = NULL;
-                          psr->next = NULL;
-                          if (tail == NULL)
-                            {
-                              sr = psr;
-                              old_chain = make_cleanup ((make_cleanup_func) 
-                                                      free_search_symbols, &sr);
-                            }
-                          else
-                            tail->next = psr;
-                          tail = psr;
-                        }
-                    }
-                }
-            }
-        }
+      {
+	if (MSYMBOL_TYPE (msymbol) == ourtype ||
+	    MSYMBOL_TYPE (msymbol) == ourtype2 ||
+	    MSYMBOL_TYPE (msymbol) == ourtype3 ||
+	    MSYMBOL_TYPE (msymbol) == ourtype4)
+	  {
+	    if (regexp == NULL || SYMBOL_MATCHES_REGEXP (msymbol))
+	      {
+		/* Functions:  Look up by address. */
+		if (kind != FUNCTIONS_NAMESPACE ||
+		    (0 == find_pc_symtab (SYMBOL_VALUE_ADDRESS (msymbol))))
+		  {
+		    /* Variables/Absolutes:  Look up by name */
+		    if (lookup_symbol (SYMBOL_NAME (msymbol),
+				       (struct block *) NULL, VAR_NAMESPACE,
+				       0, (struct symtab **) NULL) == NULL)
+		      {
+			/* match */
+			psr = (struct symbol_search *) xmalloc (sizeof (struct symbol_search));
+			psr->block = i;
+			psr->msymbol = msymbol;
+			psr->symtab = NULL;
+			psr->symbol = NULL;
+			psr->next = NULL;
+			if (tail == NULL)
+			  {
+			    sr = psr;
+			    old_chain = make_cleanup ((make_cleanup_func)
+						  free_search_symbols, &sr);
+			  }
+			else
+			  tail->next = psr;
+			tail = psr;
+		      }
+		  }
+	      }
+	  }
+      }
     }
 
   *matches = sr;
@@ -3783,7 +3818,7 @@ search_symbols (regexp, kind, nfiles, files, matches)
 /* Helper function for symtab_symbol_info, this function uses
    the data returned from search_symbols() to print information
    regarding the match to gdb_stdout.
-*/
+ */
 static void
 print_symbol_info (kind, s, sym, block, last)
      namespace_enum kind;
@@ -3801,74 +3836,75 @@ print_symbol_info (kind, s, sym, block, last)
 
   if (kind != TYPES_NAMESPACE && block == STATIC_BLOCK)
     printf_filtered ("static ");
-	    
+
   /* Typedef that is not a C++ class */
   if (kind == TYPES_NAMESPACE
       && SYMBOL_NAMESPACE (sym) != STRUCT_NAMESPACE)
-    c_typedef_print (SYMBOL_TYPE(sym), sym, gdb_stdout);
+    c_typedef_print (SYMBOL_TYPE (sym), sym, gdb_stdout);
   /* variable, func, or typedef-that-is-c++-class */
-  else if (kind < TYPES_NAMESPACE || 
-           (kind == TYPES_NAMESPACE && 
-            SYMBOL_NAMESPACE(sym) == STRUCT_NAMESPACE))
+  else if (kind < TYPES_NAMESPACE ||
+	   (kind == TYPES_NAMESPACE &&
+	    SYMBOL_NAMESPACE (sym) == STRUCT_NAMESPACE))
     {
       type_print (SYMBOL_TYPE (sym),
-                  (SYMBOL_CLASS (sym) == LOC_TYPEDEF
-                   ? "" : SYMBOL_SOURCE_NAME (sym)),
-                  gdb_stdout, 0);
+		  (SYMBOL_CLASS (sym) == LOC_TYPEDEF
+		   ? "" : SYMBOL_SOURCE_NAME (sym)),
+		  gdb_stdout, 0);
 
       printf_filtered (";\n");
     }
   else
     {
-# if 0
+#if 0
       /* Tiemann says: "info methods was never implemented."  */
       char *demangled_name;
-      c_type_print_base (TYPE_FN_FIELD_TYPE(t, block),
-                         gdb_stdout, 0, 0); 
-      c_type_print_varspec_prefix (TYPE_FN_FIELD_TYPE(t, block),
-                                   gdb_stdout, 0); 
+      c_type_print_base (TYPE_FN_FIELD_TYPE (t, block),
+			 gdb_stdout, 0, 0);
+      c_type_print_varspec_prefix (TYPE_FN_FIELD_TYPE (t, block),
+				   gdb_stdout, 0);
       if (TYPE_FN_FIELD_STUB (t, block))
-        check_stub_method (TYPE_DOMAIN_TYPE (type), j, block);
+	check_stub_method (TYPE_DOMAIN_TYPE (type), j, block);
       demangled_name =
-        cplus_demangle (TYPE_FN_FIELD_PHYSNAME (t, block),
-                        DMGL_ANSI | DMGL_PARAMS);
+	cplus_demangle (TYPE_FN_FIELD_PHYSNAME (t, block),
+			DMGL_ANSI | DMGL_PARAMS);
       if (demangled_name == NULL)
-        fprintf_filtered (stream, "<badly mangled name %s>",
-                          TYPE_FN_FIELD_PHYSNAME (t, block));
+	fprintf_filtered (stream, "<badly mangled name %s>",
+			  TYPE_FN_FIELD_PHYSNAME (t, block));
       else
-        {
-          fputs_filtered (demangled_name, stream);
-          free (demangled_name);
-        }
-# endif
+	{
+	  fputs_filtered (demangled_name, stream);
+	  free (demangled_name);
+	}
+#endif
     }
 }
 
 /* This help function for symtab_symbol_info() prints information
    for non-debugging symbols to gdb_stdout.
-*/
+ */
 static void
 print_msymbol_info (msymbol)
      struct minimal_symbol *msymbol;
 {
   printf_filtered ("	%08lx  %s\n",
-                   (unsigned long) SYMBOL_VALUE_ADDRESS (msymbol),
-                   SYMBOL_SOURCE_NAME (msymbol));
+		   (unsigned long) SYMBOL_VALUE_ADDRESS (msymbol),
+		   SYMBOL_SOURCE_NAME (msymbol));
 }
 
 /* This is the guts of the commands "info functions", "info types", and
    "info variables". It calls search_symbols to find all matches and then
    print_[m]symbol_info to print out some useful information about the
    matches.
-*/
+ */
 static void
 symtab_symbol_info (regexp, kind, from_tty)
      char *regexp;
      namespace_enum kind;
-     int   from_tty;
+     int from_tty;
 {
   static char *classnames[]
-    = {"variable", "function", "type", "method"};
+  =
+  {"variable", "function", "type", "method"};
   struct symbol_search *symbols;
   struct symbol_search *p;
   struct cleanup *old_chain;
@@ -3880,32 +3916,32 @@ symtab_symbol_info (regexp, kind, from_tty)
   old_chain = make_cleanup ((make_cleanup_func) free_search_symbols, symbols);
 
   printf_filtered (regexp
-                   ? "All %ss matching regular expression \"%s\":\n"
-                   : "All defined %ss:\n",
-                   classnames[(int) (kind - LABEL_NAMESPACE - 1)], regexp);
+		   ? "All %ss matching regular expression \"%s\":\n"
+		   : "All defined %ss:\n",
+		   classnames[(int) (kind - LABEL_NAMESPACE - 1)], regexp);
 
   for (p = symbols; p != NULL; p = p->next)
     {
       QUIT;
 
       if (p->msymbol != NULL)
-        {
-          if (first)
-            {
-              printf_filtered ("\nNon-debugging symbols:\n");
-              first = 0;
-            }
-          print_msymbol_info (p->msymbol);
-        }
+	{
+	  if (first)
+	    {
+	      printf_filtered ("\nNon-debugging symbols:\n");
+	      first = 0;
+	    }
+	  print_msymbol_info (p->msymbol);
+	}
       else
-        {
-          print_symbol_info (kind,
-                             p->symtab,
-                             p->symbol,
-                             p->block,
-                             last_filename);
-          last_filename = p->symtab->filename;
-        }
+	{
+	  print_symbol_info (kind,
+			     p->symtab,
+			     p->symbol,
+			     p->block,
+			     last_filename);
+	  last_filename = p->symtab->filename;
+	}
     }
 
   do_cleanups (old_chain);
@@ -3961,33 +3997,33 @@ rbreak_command (regexp, from_tty)
   for (p = ss; p != NULL; p = p->next)
     {
       if (p->msymbol == NULL)
-        {
-          char *string = (char *) alloca (strlen (p->symtab->filename)
-                                          + strlen (SYMBOL_NAME (p->symbol))
-                                          + 4);
-          strcpy (string, p->symtab->filename);
-          strcat (string, ":'");
-          strcat (string, SYMBOL_NAME (p->symbol));
-          strcat (string, "'");
-          break_command (string, from_tty);
-          print_symbol_info (FUNCTIONS_NAMESPACE,
-                             p->symtab,
-                             p->symbol,
-                             p->block,
-                             p->symtab->filename);
-        }
+	{
+	  char *string = (char *) alloca (strlen (p->symtab->filename)
+					  + strlen (SYMBOL_NAME (p->symbol))
+					  + 4);
+	  strcpy (string, p->symtab->filename);
+	  strcat (string, ":'");
+	  strcat (string, SYMBOL_NAME (p->symbol));
+	  strcat (string, "'");
+	  break_command (string, from_tty);
+	  print_symbol_info (FUNCTIONS_NAMESPACE,
+			     p->symtab,
+			     p->symbol,
+			     p->block,
+			     p->symtab->filename);
+	}
       else
-        {
-          break_command (SYMBOL_NAME (p->msymbol), from_tty);
-          printf_filtered ("<function, no debug info> %s;\n",
-                           SYMBOL_SOURCE_NAME (p->msymbol));
-        }
+	{
+	  break_command (SYMBOL_NAME (p->msymbol), from_tty);
+	  printf_filtered ("<function, no debug info> %s;\n",
+			   SYMBOL_SOURCE_NAME (p->msymbol));
+	}
     }
 
   do_cleanups (old_chain);
 }
-
 
+
 /* Return Nonzero if block a is lexically nested within block b,
    or if a and b have the same pc range.
    Return zero otherwise. */
@@ -3998,10 +4034,10 @@ contained_in (a, b)
   if (!a || !b)
     return 0;
   return BLOCK_START (a) >= BLOCK_START (b)
-      && BLOCK_END (a)   <= BLOCK_END (b);
+    && BLOCK_END (a) <= BLOCK_END (b);
 }
-
 
+
 /* Helper routine for make_symbol_completion_list.  */
 
 static int return_val_size;
@@ -4022,8 +4058,8 @@ static char **return_val;
   } while (0)
 
 /*  Test to see if the symbol specified by SYMNAME (which is already
-    demangled for C++ symbols) matches SYM_TEXT in the first SYM_TEXT_LEN
-    characters.  If so, add it to the current completion list. */
+   demangled for C++ symbols) matches SYM_TEXT in the first SYM_TEXT_LEN
+   characters.  If so, add it to the current completion list. */
 
 static void
 completion_list_add_name (symname, sym_text, sym_text_len, text, word)
@@ -4053,7 +4089,7 @@ completion_list_add_name (symname, sym_text, sym_text_len, text, word)
 	  return;
 	}
     }
-  
+
   /* We have a match for a completion, so add SYMNAME to the current list
      of matches. Note that the name is moved to freshly malloc'd space. */
 
@@ -4145,7 +4181,7 @@ make_symbol_completion_list (text, word)
 	      quote_found = '\0';
 	    else if (*p == '\\' && p[1] == quote_found)
 	      /* A backslash followed by the quote character
-		 doesn't end the string.  */
+	         doesn't end the string.  */
 	      ++p;
 	  }
 	else if (*p == '\'' || *p == '"')
@@ -4159,7 +4195,7 @@ make_symbol_completion_list (text, word)
       sym_text = quote_pos + 1;
     else if (quote_found == '"')
       /* A double-quoted string is never a symbol, nor does it make sense
-	 to complete it any other way.  */
+         to complete it any other way.  */
       return NULL;
     else
       {
@@ -4187,30 +4223,31 @@ make_symbol_completion_list (text, word)
      by matching SYM_TEXT.  Add each one that you find to the list.  */
 
   ALL_PSYMTABS (objfile, ps)
-    {
-      /* If the psymtab's been read in we'll get it when we search
-	 through the blockvector.  */
-      if (ps->readin) continue;
-      
-      for (psym = objfile->global_psymbols.list + ps->globals_offset;
-	   psym < (objfile->global_psymbols.list + ps->globals_offset
-		   + ps->n_global_syms);
-	   psym++)
-	{
-	  /* If interrupted, then quit. */
-	  QUIT;
-	  COMPLETION_LIST_ADD_SYMBOL (*psym, sym_text, sym_text_len, text, word);
-	}
-      
-      for (psym = objfile->static_psymbols.list + ps->statics_offset;
-	   psym < (objfile->static_psymbols.list + ps->statics_offset
-		   + ps->n_static_syms);
-	   psym++)
-	{
-	  QUIT;
-	  COMPLETION_LIST_ADD_SYMBOL (*psym, sym_text, sym_text_len, text, word);
-	}
-    }
+  {
+    /* If the psymtab's been read in we'll get it when we search
+       through the blockvector.  */
+    if (ps->readin)
+      continue;
+
+    for (psym = objfile->global_psymbols.list + ps->globals_offset;
+	 psym < (objfile->global_psymbols.list + ps->globals_offset
+		 + ps->n_global_syms);
+	 psym++)
+      {
+	/* If interrupted, then quit. */
+	QUIT;
+	COMPLETION_LIST_ADD_SYMBOL (*psym, sym_text, sym_text_len, text, word);
+      }
+
+    for (psym = objfile->static_psymbols.list + ps->statics_offset;
+	 psym < (objfile->static_psymbols.list + ps->statics_offset
+		 + ps->n_static_syms);
+	 psym++)
+      {
+	QUIT;
+	COMPLETION_LIST_ADD_SYMBOL (*psym, sym_text, sym_text_len, text, word);
+      }
+  }
 
   /* At this point scan through the misc symbol vectors and add each
      symbol you find to the list.  Eventually we want to ignore
@@ -4218,10 +4255,10 @@ make_symbol_completion_list (text, word)
      handled by the psymtab code above).  */
 
   ALL_MSYMBOLS (objfile, msymbol)
-    {
-      QUIT;
-      COMPLETION_LIST_ADD_SYMBOL (msymbol, sym_text, sym_text_len, text, word);
-    }
+  {
+    QUIT;
+    COMPLETION_LIST_ADD_SYMBOL (msymbol, sym_text, sym_text_len, text, word);
+  }
 
   /* Search upwards from currently selected frame (so that we can
      complete on local vars.  */
@@ -4230,11 +4267,11 @@ make_symbol_completion_list (text, word)
     {
       if (!BLOCK_SUPERBLOCK (b))
 	{
-	  surrounding_static_block = b; 	/* For elmin of dups */
+	  surrounding_static_block = b;		/* For elmin of dups */
 	}
-      
+
       /* Also catch fields of types defined in this places which match our
-	 text string.  Only complete on types visible from current context. */
+         text string.  Only complete on types visible from current context. */
 
       for (i = 0; i < BLOCK_NSYMS (b); i++)
 	{
@@ -4252,7 +4289,7 @@ make_symbol_completion_list (text, word)
 		      if (TYPE_FIELD_NAME (t, j))
 			{
 			  completion_list_add_name (TYPE_FIELD_NAME (t, j),
-						      sym_text, sym_text_len, text, word);
+					sym_text, sym_text_len, text, word);
 			}
 		    }
 		}
@@ -4264,28 +4301,29 @@ make_symbol_completion_list (text, word)
      symbols which match.  */
 
   ALL_SYMTABS (objfile, s)
-    {
-      QUIT;
-      b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), GLOBAL_BLOCK);
-      for (i = 0; i < BLOCK_NSYMS (b); i++)
-	{
-	  sym = BLOCK_SYM (b, i);
-	  COMPLETION_LIST_ADD_SYMBOL (sym, sym_text, sym_text_len, text, word);
-	}
-    }
+  {
+    QUIT;
+    b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), GLOBAL_BLOCK);
+    for (i = 0; i < BLOCK_NSYMS (b); i++)
+      {
+	sym = BLOCK_SYM (b, i);
+	COMPLETION_LIST_ADD_SYMBOL (sym, sym_text, sym_text_len, text, word);
+      }
+  }
 
   ALL_SYMTABS (objfile, s)
-    {
-      QUIT;
-      b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), STATIC_BLOCK);
-      /* Don't do this block twice.  */
-      if (b == surrounding_static_block) continue;
-      for (i = 0; i < BLOCK_NSYMS (b); i++)
-	{
-	  sym = BLOCK_SYM (b, i);
-	  COMPLETION_LIST_ADD_SYMBOL (sym, sym_text, sym_text_len, text, word);
-	}
-    }
+  {
+    QUIT;
+    b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), STATIC_BLOCK);
+    /* Don't do this block twice.  */
+    if (b == surrounding_static_block)
+      continue;
+    for (i = 0; i < BLOCK_NSYMS (b); i++)
+      {
+	sym = BLOCK_SYM (b, i);
+	COMPLETION_LIST_ADD_SYMBOL (sym, sym_text, sym_text_len, text, word);
+      }
+  }
 
   return (return_val);
 }
@@ -4328,12 +4366,13 @@ in_prologue (pc, func_start)
    likely that the user has stepped into a library function w/o symbols, or
    is doing a stepi/nexti through code without symbols.  */
 
- nosyms:
+nosyms:
 
 /* If func_start is zero (meaning unknown) then we don't know whether pc is
    in the prologue or not.  I.E. it might be. */
 
-  if (!func_start) return 1;
+  if (!func_start)
+    return 1;
 
 /* We need to call the target-specific prologue skipping functions with the
    function's start address because PC may be pointing at an instruction that
@@ -4353,19 +4392,19 @@ static int sym_return_val_index;
 static struct symbol **sym_return_val;
 
 /*  Test to see if the symbol specified by SYMNAME (which is already
-    demangled for C++ symbols) matches SYM_TEXT in the first SYM_TEXT_LEN
-    characters.  If so, add it to the current completion list. */
+   demangled for C++ symbols) matches SYM_TEXT in the first SYM_TEXT_LEN
+   characters.  If so, add it to the current completion list. */
 
 static void
 overload_list_add_symbol (sym, oload_name)
-  struct symbol * sym;
-  char * oload_name;
+     struct symbol *sym;
+     char *oload_name;
 {
   int newsize;
   int i;
 
   /* Get the demangled name without parameters */
-  char * sym_name = cplus_demangle (SYMBOL_NAME (sym), DMGL_ARM | DMGL_ANSI);
+  char *sym_name = cplus_demangle (SYMBOL_NAME (sym), DMGL_ARM | DMGL_ANSI);
   if (!sym_name)
     {
       sym_name = (char *) xmalloc (strlen (SYMBOL_NAME (sym)) + 1);
@@ -4394,7 +4433,7 @@ overload_list_add_symbol (sym, oload_name)
     }
   sym_return_val[sym_return_val_index++] = sym;
   sym_return_val[sym_return_val_index] = NULL;
-  
+
   free (sym_name);
 }
 
@@ -4406,7 +4445,7 @@ overload_list_add_symbol (sym, oload_name)
 
 struct symbol **
 make_symbol_overload_list (fsym)
-  struct symbol * fsym;
+     struct symbol *fsym;
 {
   register struct symbol *sym;
   register struct symtab *s;
@@ -4451,30 +4490,31 @@ make_symbol_overload_list (fsym)
      by matching OLOAD_NAME.  Add each one that you find to the list.  */
 
   ALL_PSYMTABS (objfile, ps)
-    {
-      /* If the psymtab's been read in we'll get it when we search
-	 through the blockvector.  */
-      if (ps->readin) continue;
-      
-      for (psym = objfile->global_psymbols.list + ps->globals_offset;
-	   psym < (objfile->global_psymbols.list + ps->globals_offset
-		   + ps->n_global_syms);
-	   psym++)
-	{
-	  /* If interrupted, then quit. */
-	  QUIT;
-	  overload_list_add_symbol (*psym, oload_name);
-	}
-      
-      for (psym = objfile->static_psymbols.list + ps->statics_offset;
-	   psym < (objfile->static_psymbols.list + ps->statics_offset
-		   + ps->n_static_syms);
-	   psym++)
-	{
-	  QUIT;
-	  overload_list_add_symbol (*psym, oload_name);
-	}
-    }
+  {
+    /* If the psymtab's been read in we'll get it when we search
+       through the blockvector.  */
+    if (ps->readin)
+      continue;
+
+    for (psym = objfile->global_psymbols.list + ps->globals_offset;
+	 psym < (objfile->global_psymbols.list + ps->globals_offset
+		 + ps->n_global_syms);
+	 psym++)
+      {
+	/* If interrupted, then quit. */
+	QUIT;
+	overload_list_add_symbol (*psym, oload_name);
+      }
+
+    for (psym = objfile->static_psymbols.list + ps->statics_offset;
+	 psym < (objfile->static_psymbols.list + ps->statics_offset
+		 + ps->n_static_syms);
+	 psym++)
+      {
+	QUIT;
+	overload_list_add_symbol (*psym, oload_name);
+      }
+  }
 
   /* At this point scan through the misc symbol vectors and add each
      symbol you find to the list.  Eventually we want to ignore
@@ -4482,10 +4522,10 @@ make_symbol_overload_list (fsym)
      handled by the psymtab code above).  */
 
   ALL_MSYMBOLS (objfile, msymbol)
-    {
-      QUIT;
-      overload_list_add_symbol (msymbol, oload_name);
-    }
+  {
+    QUIT;
+    overload_list_add_symbol (msymbol, oload_name);
+  }
 #endif
 
   /* Search upwards from currently selected frame (so that we can
@@ -4495,11 +4535,11 @@ make_symbol_overload_list (fsym)
     {
       if (!BLOCK_SUPERBLOCK (b))
 	{
-	  surrounding_static_block = b; 	/* For elimination of dups */
+	  surrounding_static_block = b;		/* For elimination of dups */
 	}
-      
+
       /* Also catch fields of types defined in this places which match our
-	 text string.  Only complete on types visible from current context. */
+         text string.  Only complete on types visible from current context. */
 
       for (i = 0; i < BLOCK_NSYMS (b); i++)
 	{
@@ -4512,28 +4552,29 @@ make_symbol_overload_list (fsym)
      symbols which match.  */
 
   ALL_SYMTABS (objfile, s)
-    {
-      QUIT;
-      b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), GLOBAL_BLOCK);
-      for (i = 0; i < BLOCK_NSYMS (b); i++)
-	{
-	  sym = BLOCK_SYM (b, i);
-	  overload_list_add_symbol (sym, oload_name);
-	}
-    }
+  {
+    QUIT;
+    b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), GLOBAL_BLOCK);
+    for (i = 0; i < BLOCK_NSYMS (b); i++)
+      {
+	sym = BLOCK_SYM (b, i);
+	overload_list_add_symbol (sym, oload_name);
+      }
+  }
 
   ALL_SYMTABS (objfile, s)
-    {
-      QUIT;
-      b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), STATIC_BLOCK);
-      /* Don't do this block twice.  */
-      if (b == surrounding_static_block) continue;
-      for (i = 0; i < BLOCK_NSYMS (b); i++)
-	{
-	  sym = BLOCK_SYM (b, i);
-	  overload_list_add_symbol (sym, oload_name);
-	}
-    }
+  {
+    QUIT;
+    b = BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), STATIC_BLOCK);
+    /* Don't do this block twice.  */
+    if (b == surrounding_static_block)
+      continue;
+    for (i = 0; i < BLOCK_NSYMS (b); i++)
+      {
+	sym = BLOCK_SYM (b, i);
+	overload_list_add_symbol (sym, oload_name);
+      }
+  }
 
   free (oload_name);
 
@@ -4541,16 +4582,16 @@ make_symbol_overload_list (fsym)
 }
 
 /* End of overload resolution functions */
-
 
+
 void
 _initialize_symtab ()
 {
   add_info ("variables", variables_info,
-	    "All global and static variable names, or those matching REGEXP.");
+	 "All global and static variable names, or those matching REGEXP.");
   if (dbx_commands)
-    add_com("whereis", class_info, variables_info, 
-	    "All global and static variable names, or those matching REGEXP.");
+    add_com ("whereis", class_info, variables_info,
+	 "All global and static variable names, or those matching REGEXP.");
 
   add_info ("functions", functions_info,
 	    "All function names, or those matching REGEXP.");
@@ -4558,9 +4599,9 @@ _initialize_symtab ()
   /* FIXME:  This command has at least the following problems:
      1.  It prints builtin types (in a very strange and confusing fashion).
      2.  It doesn't print right, e.g. with
-         typedef struct foo *FOO
-	 type_print prints "FOO" when we want to make it (in this situation)
-	 print "struct foo *".
+     typedef struct foo *FOO
+     type_print prints "FOO" when we want to make it (in this situation)
+     print "struct foo *".
      I also think "ptype" or "whatis" is more likely to be useful (but if
      there is much disagreement "info types" can be fixed).  */
   add_info ("types", types_info,
@@ -4577,13 +4618,13 @@ are listed.");
 	    "Source files in the program.");
 
   add_com ("rbreak", class_breakpoint, rbreak_command,
-	    "Set a breakpoint for all functions matching REGEXP.");
+	   "Set a breakpoint for all functions matching REGEXP.");
 
   if (xdb_commands)
     {
       add_com ("lf", class_info, sources_info, "Source files in the program");
       add_com ("lg", class_info, variables_info,
-	    "All global and static variable names, or those matching REGEXP.");
+	 "All global and static variable names, or those matching REGEXP.");
     }
 
   /* Initialize the one built-in type that isn't language dependent... */