import gdb-1999-07-07 post reformat

1 files changed, 254 insertions, 254 deletions

diff --git a/gdb/objfiles.c b/gdb/objfiles.c
index 91f4aa4..436dcb8 100644
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -2,21 +2,22 @@
    Copyright 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
    Contributed by Cygnus Support, using pieces from other GDB modules.
 
-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.  */
 
 /* This file contains support routines for creating, manipulating, and
    destroying objfile structures. */
@@ -48,9 +49,9 @@ static int
 open_mapped_file PARAMS ((char *filename, long mtime, int mapped));
 
 static PTR
-map_to_file PARAMS ((int));
+  map_to_file PARAMS ((int));
 
-#endif  /* defined(USE_MMALLOC) && defined(HAVE_MMAP) */
+#endif /* defined(USE_MMALLOC) && defined(HAVE_MMAP) */
 
 static void
 add_to_objfile_sections PARAMS ((bfd *, sec_ptr, PTR));
@@ -58,12 +59,12 @@ add_to_objfile_sections PARAMS ((bfd *, sec_ptr, PTR));
 /* Externally visible variables that are owned by this module.
    See declarations in objfile.h for more info. */
 
-struct objfile *object_files;		/* Linked list of all objfiles */
+struct objfile *object_files;	/* Linked list of all objfiles */
 struct objfile *current_objfile;	/* For symbol file being read in */
 struct objfile *symfile_objfile;	/* Main symbol table loaded from */
 struct objfile *rt_common_objfile;	/* For runtime common symbols */
 
-int mapped_symbol_files;		/* Try to use mapped symbol files */
+int mapped_symbol_files;	/* Try to use mapped symbol files */
 
 /* Locate all mappable sections of a BFD file. 
    objfile_p_char is a char * to get it through
@@ -85,7 +86,7 @@ add_to_objfile_sections (abfd, asect, objfile_p_char)
 
   aflag = bfd_get_section_flags (abfd, asect);
 
-  if (!(aflag & SEC_ALLOC) && !(TARGET_KEEP_SECTION(asect)))
+  if (!(aflag & SEC_ALLOC) && !(TARGET_KEEP_SECTION (asect)))
     return;
 
   if (0 == bfd_section_size (abfd, asect))
@@ -96,7 +97,7 @@ add_to_objfile_sections (abfd, asect, objfile_p_char)
   section.ovly_mapped = 0;
   section.addr = bfd_section_vma (abfd, asect);
   section.endaddr = section.addr + bfd_section_size (abfd, asect);
-  obstack_grow (&objfile->psymbol_obstack, (char *) &section, sizeof(section));
+  obstack_grow (&objfile->psymbol_obstack, (char *) &section, sizeof (section));
   objfile->sections_end = (struct obj_section *) (((unsigned long) objfile->sections_end) + 1);
 }
 
@@ -115,11 +116,11 @@ build_objfile_section_table (objfile)
      waste some memory.  */
 
   objfile->sections_end = 0;
-  bfd_map_over_sections (objfile->obfd, add_to_objfile_sections, (char *)objfile);
+  bfd_map_over_sections (objfile->obfd, add_to_objfile_sections, (char *) objfile);
   objfile->sections = (struct obj_section *)
     obstack_finish (&objfile->psymbol_obstack);
   objfile->sections_end = objfile->sections + (unsigned long) objfile->sections_end;
-  return(0);
+  return (0);
 }
 
 /* Given a pointer to an initialized bfd (ABFD) and a flag that indicates
@@ -138,8 +139,8 @@ struct objfile *
 allocate_objfile (abfd, mapped, user_loaded, is_solib)
      bfd *abfd;
      int mapped;
-     int  user_loaded;
-     int  is_solib;
+     int user_loaded;
+     int is_solib;
 {
   struct objfile *objfile = NULL;
   struct objfile *last_one = NULL;
@@ -148,101 +149,101 @@ allocate_objfile (abfd, mapped, user_loaded, is_solib)
 
 #if defined(USE_MMALLOC) && defined(HAVE_MMAP)
   if (abfd != NULL)
-  {
+    {
 
-    /* If we can support mapped symbol files, try to open/reopen the
-       mapped file that corresponds to the file from which we wish to
-       read symbols.  If the objfile is to be mapped, we must malloc
-       the structure itself using the mmap version, and arrange that
-       all memory allocation for the objfile uses the mmap routines.
-       If we are reusing an existing mapped file, from which we get
-       our objfile pointer, we have to make sure that we update the
-       pointers to the alloc/free functions in the obstack, in case
-       these functions have moved within the current gdb.  */
-
-    int fd;
-
-    fd = open_mapped_file (bfd_get_filename (abfd), bfd_get_mtime (abfd),
-			   mapped);
-    if (fd >= 0)
-      {
-	PTR md;
+      /* If we can support mapped symbol files, try to open/reopen the
+         mapped file that corresponds to the file from which we wish to
+         read symbols.  If the objfile is to be mapped, we must malloc
+         the structure itself using the mmap version, and arrange that
+         all memory allocation for the objfile uses the mmap routines.
+         If we are reusing an existing mapped file, from which we get
+         our objfile pointer, we have to make sure that we update the
+         pointers to the alloc/free functions in the obstack, in case
+         these functions have moved within the current gdb.  */
+
+      int fd;
+
+      fd = open_mapped_file (bfd_get_filename (abfd), bfd_get_mtime (abfd),
+			     mapped);
+      if (fd >= 0)
+	{
+	  PTR md;
 
-	if ((md = map_to_file (fd)) == NULL)
-	  {
-	    close (fd);
-	  }
-	else if ((objfile = (struct objfile *) mmalloc_getkey (md, 0)) != NULL)
-	  {
-	    /* Update memory corruption handler function addresses. */
-	    init_malloc (md);
-	    objfile -> md = md;
-	    objfile -> mmfd = fd;
-	    /* Update pointers to functions to *our* copies */
-	    obstack_chunkfun (&objfile -> psymbol_cache.cache, xmmalloc);
-	    obstack_freefun (&objfile -> psymbol_cache.cache, mfree);
-	    obstack_chunkfun (&objfile -> psymbol_obstack, xmmalloc);
-	    obstack_freefun (&objfile -> psymbol_obstack, mfree);
-	    obstack_chunkfun (&objfile -> symbol_obstack, xmmalloc);
-	    obstack_freefun (&objfile -> symbol_obstack, mfree);
-	    obstack_chunkfun (&objfile -> type_obstack, xmmalloc);
-	    obstack_freefun (&objfile -> type_obstack, mfree);
-	    /* If already in objfile list, unlink it. */
-	    unlink_objfile (objfile);
-	    /* Forget things specific to a particular gdb, may have changed. */
-	    objfile -> sf = NULL;
-	  }
-	else
-	  {
+	  if ((md = map_to_file (fd)) == NULL)
+	    {
+	      close (fd);
+	    }
+	  else if ((objfile = (struct objfile *) mmalloc_getkey (md, 0)) != NULL)
+	    {
+	      /* Update memory corruption handler function addresses. */
+	      init_malloc (md);
+	      objfile->md = md;
+	      objfile->mmfd = fd;
+	      /* Update pointers to functions to *our* copies */
+	      obstack_chunkfun (&objfile->psymbol_cache.cache, xmmalloc);
+	      obstack_freefun (&objfile->psymbol_cache.cache, mfree);
+	      obstack_chunkfun (&objfile->psymbol_obstack, xmmalloc);
+	      obstack_freefun (&objfile->psymbol_obstack, mfree);
+	      obstack_chunkfun (&objfile->symbol_obstack, xmmalloc);
+	      obstack_freefun (&objfile->symbol_obstack, mfree);
+	      obstack_chunkfun (&objfile->type_obstack, xmmalloc);
+	      obstack_freefun (&objfile->type_obstack, mfree);
+	      /* If already in objfile list, unlink it. */
+	      unlink_objfile (objfile);
+	      /* Forget things specific to a particular gdb, may have changed. */
+	      objfile->sf = NULL;
+	    }
+	  else
+	    {
 
-	    /* Set up to detect internal memory corruption.  MUST be
-	       done before the first malloc.  See comments in
-	       init_malloc() and mmcheck().  */
-
-	    init_malloc (md);
-
-	    objfile = (struct objfile *)
-	      xmmalloc (md, sizeof (struct objfile));
-	    memset (objfile, 0, sizeof (struct objfile));
-	    objfile -> md = md;
-	    objfile -> mmfd = fd;
-	    objfile -> flags |= OBJF_MAPPED;
-	    mmalloc_setkey (objfile -> md, 0, objfile);
-	    obstack_specify_allocation_with_arg (&objfile -> psymbol_cache.cache,
-						 0, 0, xmmalloc, mfree,
-						 objfile -> md);
-	    obstack_specify_allocation_with_arg (&objfile -> psymbol_obstack,
-						 0, 0, xmmalloc, mfree,
-						 objfile -> md);
-	    obstack_specify_allocation_with_arg (&objfile -> symbol_obstack,
-						 0, 0, xmmalloc, mfree,
-						 objfile -> md);
-	    obstack_specify_allocation_with_arg (&objfile -> type_obstack,
-						 0, 0, xmmalloc, mfree,
-						 objfile -> md);
-	  }
-      }
+	      /* Set up to detect internal memory corruption.  MUST be
+	         done before the first malloc.  See comments in
+	         init_malloc() and mmcheck().  */
+
+	      init_malloc (md);
+
+	      objfile = (struct objfile *)
+		xmmalloc (md, sizeof (struct objfile));
+	      memset (objfile, 0, sizeof (struct objfile));
+	      objfile->md = md;
+	      objfile->mmfd = fd;
+	      objfile->flags |= OBJF_MAPPED;
+	      mmalloc_setkey (objfile->md, 0, objfile);
+	      obstack_specify_allocation_with_arg (&objfile->psymbol_cache.cache,
+						   0, 0, xmmalloc, mfree,
+						   objfile->md);
+	      obstack_specify_allocation_with_arg (&objfile->psymbol_obstack,
+						   0, 0, xmmalloc, mfree,
+						   objfile->md);
+	      obstack_specify_allocation_with_arg (&objfile->symbol_obstack,
+						   0, 0, xmmalloc, mfree,
+						   objfile->md);
+	      obstack_specify_allocation_with_arg (&objfile->type_obstack,
+						   0, 0, xmmalloc, mfree,
+						   objfile->md);
+	    }
+	}
 
-    if (mapped && (objfile == NULL))
-      {
-	warning ("symbol table for '%s' will not be mapped",
-		 bfd_get_filename (abfd));
-      }
-  }
-#else	/* !defined(USE_MMALLOC) || !defined(HAVE_MMAP) */
+      if (mapped && (objfile == NULL))
+	{
+	  warning ("symbol table for '%s' will not be mapped",
+		   bfd_get_filename (abfd));
+	}
+    }
+#else /* !defined(USE_MMALLOC) || !defined(HAVE_MMAP) */
 
   if (mapped)
     {
       warning ("mapped symbol tables are not supported on this machine; missing or broken mmap().");
 
       /* Turn off the global flag so we don't try to do mapped symbol tables
-	 any more, which shuts up gdb unless the user specifically gives the
-	 "mapped" keyword again. */
+         any more, which shuts up gdb unless the user specifically gives the
+         "mapped" keyword again. */
 
       mapped_symbol_files = 0;
     }
 
-#endif	/* defined(USE_MMALLOC) && defined(HAVE_MMAP) */
+#endif /* defined(USE_MMALLOC) && defined(HAVE_MMAP) */
 
   /* If we don't support mapped symbol files, didn't ask for the file to be
      mapped, or failed to open the mapped file for some reason, then revert
@@ -252,14 +253,14 @@ allocate_objfile (abfd, mapped, user_loaded, is_solib)
     {
       objfile = (struct objfile *) xmalloc (sizeof (struct objfile));
       memset (objfile, 0, sizeof (struct objfile));
-      objfile -> md = NULL;
-      obstack_specify_allocation (&objfile -> psymbol_cache.cache, 0, 0,
+      objfile->md = NULL;
+      obstack_specify_allocation (&objfile->psymbol_cache.cache, 0, 0,
 				  xmalloc, free);
-      obstack_specify_allocation (&objfile -> psymbol_obstack, 0, 0, xmalloc,
+      obstack_specify_allocation (&objfile->psymbol_obstack, 0, 0, xmalloc,
 				  free);
-      obstack_specify_allocation (&objfile -> symbol_obstack, 0, 0, xmalloc,
+      obstack_specify_allocation (&objfile->symbol_obstack, 0, 0, xmalloc,
 				  free);
-      obstack_specify_allocation (&objfile -> type_obstack, 0, 0, xmalloc,
+      obstack_specify_allocation (&objfile->type_obstack, 0, 0, xmalloc,
 				  free);
     }
 
@@ -267,45 +268,45 @@ allocate_objfile (abfd, mapped, user_loaded, is_solib)
      that any data that is reference is saved in the per-objfile data
      region. */
 
-  objfile -> obfd = abfd;
-  if (objfile -> name != NULL)
+  objfile->obfd = abfd;
+  if (objfile->name != NULL)
     {
-      mfree (objfile -> md, objfile -> name);
+      mfree (objfile->md, objfile->name);
     }
   if (abfd != NULL)
     {
-      objfile -> name = mstrsave (objfile -> md, bfd_get_filename (abfd));
-      objfile -> mtime = bfd_get_mtime (abfd);
+      objfile->name = mstrsave (objfile->md, bfd_get_filename (abfd));
+      objfile->mtime = bfd_get_mtime (abfd);
 
       /* Build section table.  */
 
       if (build_objfile_section_table (objfile))
 	{
-	  error ("Can't find the file sections in `%s': %s", 
-		 objfile -> name, bfd_errmsg (bfd_get_error ()));
+	  error ("Can't find the file sections in `%s': %s",
+		 objfile->name, bfd_errmsg (bfd_get_error ()));
 	}
     }
 
   /* Add this file onto the tail of the linked list of other such files. */
 
-  objfile -> next = NULL;
+  objfile->next = NULL;
   if (object_files == NULL)
     object_files = objfile;
   else
     {
       for (last_one = object_files;
-	   last_one -> next;
-	   last_one = last_one -> next);
-      last_one -> next = objfile;
+	   last_one->next;
+	   last_one = last_one->next);
+      last_one->next = objfile;
     }
 
   /* Record whether this objfile was created because the user explicitly
      caused it (e.g., used the add-symbol-file command).
-     */
-  objfile -> user_loaded = user_loaded;
+   */
+  objfile->user_loaded = user_loaded;
 
   /* Record whether this objfile definitely represents a solib. */
-  objfile -> is_solib = is_solib;
+  objfile->is_solib = is_solib;
 
   return (objfile);
 }
@@ -348,14 +349,14 @@ void
 unlink_objfile (objfile)
      struct objfile *objfile;
 {
-  struct objfile** objpp;
+  struct objfile **objpp;
 
-  for (objpp = &object_files; *objpp != NULL; objpp = &((*objpp) -> next))
+  for (objpp = &object_files; *objpp != NULL; objpp = &((*objpp)->next))
     {
-      if (*objpp == objfile) 
+      if (*objpp == objfile)
 	{
-	  *objpp = (*objpp) -> next;
-	  objfile -> next = NULL;
+	  *objpp = (*objpp)->next;
+	  objfile->next = NULL;
 	  break;
 	}
     }
@@ -369,7 +370,7 @@ unlink_objfile (objfile)
    Things which we do NOT free because they are not in malloc'd memory
    or not in memory specific to the objfile include:
 
-   	objfile -> sf
+   objfile -> sf
 
    FIXME:  If the objfile is using reusable symbol information (via mmalloc),
    then we need to take into account the fact that more than one process
@@ -389,17 +390,17 @@ free_objfile (objfile)
      freeing things which are valid only during this particular gdb
      execution, or leaving them to be reused during the next one. */
 
-  if (objfile -> sf != NULL)
+  if (objfile->sf != NULL)
     {
-      (*objfile -> sf -> sym_finish) (objfile);
+      (*objfile->sf->sym_finish) (objfile);
     }
 
   /* We always close the bfd. */
 
-  if (objfile -> obfd != NULL)
+  if (objfile->obfd != NULL)
     {
       char *name = bfd_get_filename (objfile->obfd);
-      if (!bfd_close (objfile -> obfd))
+      if (!bfd_close (objfile->obfd))
 	warning ("cannot close \"%s\": %s",
 		 name, bfd_errmsg (bfd_get_error ()));
       free (name);
@@ -421,7 +422,7 @@ free_objfile (objfile)
      symbol table was blown away.  How much still needs to be done
      is unknown, but we play it safe for now and keep each action until
      it is shown to be no longer needed. */
-     
+
 #if defined (CLEAR_SOLIB)
   CLEAR_SOLIB ();
   /* CLEAR_SOLIB closes the bfd's for any shared libraries.  But
@@ -444,39 +445,39 @@ free_objfile (objfile)
 
 #if defined(USE_MMALLOC) && defined(HAVE_MMAP)
 
-  if (objfile -> flags & OBJF_MAPPED)
+  if (objfile->flags & OBJF_MAPPED)
     {
       /* Remember the fd so we can close it.  We can't close it before
-	 doing the detach, and after the detach the objfile is gone. */
+         doing the detach, and after the detach the objfile is gone. */
       int mmfd;
 
-      mmfd = objfile -> mmfd;
-      mmalloc_detach (objfile -> md);
+      mmfd = objfile->mmfd;
+      mmalloc_detach (objfile->md);
       objfile = NULL;
       close (mmfd);
     }
 
-#endif	/* defined(USE_MMALLOC) && defined(HAVE_MMAP) */
+#endif /* defined(USE_MMALLOC) && defined(HAVE_MMAP) */
 
   /* If we still have an objfile, then either we don't support reusable
      objfiles or this one was not reusable.  So free it normally. */
 
   if (objfile != NULL)
     {
-      if (objfile -> name != NULL)
+      if (objfile->name != NULL)
 	{
-	  mfree (objfile -> md, objfile -> name);
+	  mfree (objfile->md, objfile->name);
 	}
       if (objfile->global_psymbols.list)
 	mfree (objfile->md, objfile->global_psymbols.list);
       if (objfile->static_psymbols.list)
 	mfree (objfile->md, objfile->static_psymbols.list);
       /* Free the obstacks for non-reusable objfiles */
-      obstack_free (&objfile -> psymbol_cache.cache, 0);
-      obstack_free (&objfile -> psymbol_obstack, 0);
-      obstack_free (&objfile -> symbol_obstack, 0);
-      obstack_free (&objfile -> type_obstack, 0);
-      mfree (objfile -> md, objfile);
+      obstack_free (&objfile->psymbol_cache.cache, 0);
+      obstack_free (&objfile->psymbol_obstack, 0);
+      obstack_free (&objfile->symbol_obstack, 0);
+      obstack_free (&objfile->type_obstack, 0);
+      mfree (objfile->md, objfile);
       objfile = NULL;
     }
 }
@@ -490,9 +491,9 @@ free_all_objfiles ()
   struct objfile *objfile, *temp;
 
   ALL_OBJFILES_SAFE (objfile, temp)
-    {
-      free_objfile (objfile);
-    }
+  {
+    free_objfile (objfile);
+  }
   clear_symtab_users ();
 }
 
@@ -503,9 +504,9 @@ objfile_relocate (objfile, new_offsets)
      struct objfile *objfile;
      struct section_offsets *new_offsets;
 {
-  struct section_offsets *delta = (struct section_offsets *) 
-    alloca (sizeof (struct section_offsets)
-	    + objfile->num_sections * sizeof (delta->offsets));
+  struct section_offsets *delta = (struct section_offsets *)
+  alloca (sizeof (struct section_offsets)
+	  + objfile->num_sections * sizeof (delta->offsets));
 
   {
     int i;
@@ -526,71 +527,70 @@ objfile_relocate (objfile, new_offsets)
     struct symtab *s;
 
     ALL_OBJFILE_SYMTABS (objfile, s)
-      {
-	struct linetable *l;
-	struct blockvector *bv;
-	int i;
-	
-	/* First the line table.  */
-	l = LINETABLE (s);
-	if (l)
-	  {
-	    for (i = 0; i < l->nitems; ++i)
-	      l->item[i].pc += ANOFFSET (delta, s->block_line_section);
-	  }
+    {
+      struct linetable *l;
+      struct blockvector *bv;
+      int i;
+
+      /* First the line table.  */
+      l = LINETABLE (s);
+      if (l)
+	{
+	  for (i = 0; i < l->nitems; ++i)
+	    l->item[i].pc += ANOFFSET (delta, s->block_line_section);
+	}
 
-	/* Don't relocate a shared blockvector more than once.  */
-	if (!s->primary)
-	  continue;
+      /* Don't relocate a shared blockvector more than once.  */
+      if (!s->primary)
+	continue;
 
-	bv = BLOCKVECTOR (s);
-	for (i = 0; i < BLOCKVECTOR_NBLOCKS (bv); ++i)
-	  {
-	    struct block *b;
-	    int j;
-	    
-	    b = BLOCKVECTOR_BLOCK (bv, i);
-	    BLOCK_START (b) += ANOFFSET (delta, s->block_line_section);
-	    BLOCK_END (b)   += ANOFFSET (delta, s->block_line_section);
-
-	    for (j = 0; j < BLOCK_NSYMS (b); ++j)
-	      {
-		struct symbol *sym = BLOCK_SYM (b, j);
-		/* The RS6000 code from which this was taken skipped
-		   any symbols in STRUCT_NAMESPACE or UNDEF_NAMESPACE.
-		   But I'm leaving out that test, on the theory that
-		   they can't possibly pass the tests below.  */
-		if ((SYMBOL_CLASS (sym) == LOC_LABEL
-		     || SYMBOL_CLASS (sym) == LOC_STATIC 
-                     || SYMBOL_CLASS (sym) == LOC_INDIRECT)
-		    && SYMBOL_SECTION (sym) >= 0)
-		  {
-		    SYMBOL_VALUE_ADDRESS (sym) += 
-		      ANOFFSET (delta, SYMBOL_SECTION (sym));
-		  }
+      bv = BLOCKVECTOR (s);
+      for (i = 0; i < BLOCKVECTOR_NBLOCKS (bv); ++i)
+	{
+	  struct block *b;
+	  int j;
+
+	  b = BLOCKVECTOR_BLOCK (bv, i);
+	  BLOCK_START (b) += ANOFFSET (delta, s->block_line_section);
+	  BLOCK_END (b) += ANOFFSET (delta, s->block_line_section);
+
+	  for (j = 0; j < BLOCK_NSYMS (b); ++j)
+	    {
+	      struct symbol *sym = BLOCK_SYM (b, j);
+	      /* The RS6000 code from which this was taken skipped
+	         any symbols in STRUCT_NAMESPACE or UNDEF_NAMESPACE.
+	         But I'm leaving out that test, on the theory that
+	         they can't possibly pass the tests below.  */
+	      if ((SYMBOL_CLASS (sym) == LOC_LABEL
+		   || SYMBOL_CLASS (sym) == LOC_STATIC
+		   || SYMBOL_CLASS (sym) == LOC_INDIRECT)
+		  && SYMBOL_SECTION (sym) >= 0)
+		{
+		  SYMBOL_VALUE_ADDRESS (sym) +=
+		    ANOFFSET (delta, SYMBOL_SECTION (sym));
+		}
 #ifdef MIPS_EFI_SYMBOL_NAME
-		/* Relocate Extra Function Info for ecoff.  */
+	      /* Relocate Extra Function Info for ecoff.  */
 
-		else
-		  if (SYMBOL_CLASS (sym) == LOC_CONST
-		      && SYMBOL_NAMESPACE (sym) == LABEL_NAMESPACE
-		      && STRCMP (SYMBOL_NAME (sym), MIPS_EFI_SYMBOL_NAME) == 0)
-		ecoff_relocate_efi (sym, ANOFFSET (delta, 
+	      else if (SYMBOL_CLASS (sym) == LOC_CONST
+		       && SYMBOL_NAMESPACE (sym) == LABEL_NAMESPACE
+		   && STRCMP (SYMBOL_NAME (sym), MIPS_EFI_SYMBOL_NAME) == 0)
+		ecoff_relocate_efi (sym, ANOFFSET (delta,
 						   s->block_line_section));
 #endif
-	      }
-	  }
-      }
+	    }
+	}
+    }
   }
 
   {
     struct partial_symtab *p;
 
     ALL_OBJFILE_PSYMTABS (objfile, p)
-      {
-	p->textlow += ANOFFSET (delta, SECT_OFF_TEXT);
-	p->texthigh += ANOFFSET (delta, SECT_OFF_TEXT);
-      }
+    {
+      p->textlow += ANOFFSET (delta, SECT_OFF_TEXT);
+      p->texthigh += ANOFFSET (delta, SECT_OFF_TEXT);
+    }
   }
 
   {
@@ -600,13 +600,13 @@ objfile_relocate (objfile, new_offsets)
 	 psym < objfile->global_psymbols.next;
 	 psym++)
       if (SYMBOL_SECTION (*psym) >= 0)
-	SYMBOL_VALUE_ADDRESS (*psym) += ANOFFSET (delta, 
+	SYMBOL_VALUE_ADDRESS (*psym) += ANOFFSET (delta,
 						  SYMBOL_SECTION (*psym));
     for (psym = objfile->static_psymbols.list;
 	 psym < objfile->static_psymbols.next;
 	 psym++)
       if (SYMBOL_SECTION (*psym) >= 0)
-	SYMBOL_VALUE_ADDRESS (*psym) += ANOFFSET (delta, 
+	SYMBOL_VALUE_ADDRESS (*psym) += ANOFFSET (delta,
 						  SYMBOL_SECTION (*psym));
   }
 
@@ -614,7 +614,7 @@ objfile_relocate (objfile, new_offsets)
     struct minimal_symbol *msym;
     ALL_OBJFILE_MSYMBOLS (objfile, msym)
       if (SYMBOL_SECTION (msym) >= 0)
-	SYMBOL_VALUE_ADDRESS (msym) += ANOFFSET (delta, SYMBOL_SECTION (msym));
+      SYMBOL_VALUE_ADDRESS (msym) += ANOFFSET (delta, SYMBOL_SECTION (msym));
   }
   /* Relocating different sections by different amounts may cause the symbols
      to be out of order.  */
@@ -641,40 +641,40 @@ objfile_relocate (objfile, new_offsets)
 
 	if (flags & SEC_CODE)
 	  {
-	    s->addr    += ANOFFSET (delta, SECT_OFF_TEXT);
+	    s->addr += ANOFFSET (delta, SECT_OFF_TEXT);
 	    s->endaddr += ANOFFSET (delta, SECT_OFF_TEXT);
 	  }
 	else if (flags & (SEC_DATA | SEC_LOAD))
 	  {
-	    s->addr    += ANOFFSET (delta, SECT_OFF_DATA);
+	    s->addr += ANOFFSET (delta, SECT_OFF_DATA);
 	    s->endaddr += ANOFFSET (delta, SECT_OFF_DATA);
 	  }
 	else if (flags & SEC_ALLOC)
 	  {
-	    s->addr    += ANOFFSET (delta, SECT_OFF_BSS);
+	    s->addr += ANOFFSET (delta, SECT_OFF_BSS);
 	    s->endaddr += ANOFFSET (delta, SECT_OFF_BSS);
 	  }
       }
   }
 
-  if (objfile->ei.entry_point != ~(CORE_ADDR)0)
+  if (objfile->ei.entry_point != ~(CORE_ADDR) 0)
     objfile->ei.entry_point += ANOFFSET (delta, SECT_OFF_TEXT);
 
   if (objfile->ei.entry_func_lowpc != INVALID_ENTRY_LOWPC)
     {
-      objfile->ei.entry_func_lowpc  += ANOFFSET (delta, SECT_OFF_TEXT);
+      objfile->ei.entry_func_lowpc += ANOFFSET (delta, SECT_OFF_TEXT);
       objfile->ei.entry_func_highpc += ANOFFSET (delta, SECT_OFF_TEXT);
     }
 
   if (objfile->ei.entry_file_lowpc != INVALID_ENTRY_LOWPC)
     {
-      objfile->ei.entry_file_lowpc  += ANOFFSET (delta, SECT_OFF_TEXT);
+      objfile->ei.entry_file_lowpc += ANOFFSET (delta, SECT_OFF_TEXT);
       objfile->ei.entry_file_highpc += ANOFFSET (delta, SECT_OFF_TEXT);
     }
 
   if (objfile->ei.main_func_lowpc != INVALID_ENTRY_LOWPC)
     {
-      objfile->ei.main_func_lowpc  += ANOFFSET (delta, SECT_OFF_TEXT);
+      objfile->ei.main_func_lowpc += ANOFFSET (delta, SECT_OFF_TEXT);
       objfile->ei.main_func_highpc += ANOFFSET (delta, SECT_OFF_TEXT);
     }
 
@@ -692,12 +692,12 @@ have_partial_symbols ()
   struct objfile *ofp;
 
   ALL_OBJFILES (ofp)
-    {
-      if (ofp -> psymtabs != NULL)
-	{
-	  return 1;
-	}
-    }
+  {
+    if (ofp->psymtabs != NULL)
+      {
+	return 1;
+      }
+  }
   return 0;
 }
 
@@ -711,12 +711,12 @@ have_full_symbols ()
   struct objfile *ofp;
 
   ALL_OBJFILES (ofp)
-    {
-      if (ofp -> symtabs != NULL)
-	{
-	  return 1;
-	}
-    }
+  {
+    if (ofp->symtabs != NULL)
+      {
+	return 1;
+      }
+  }
   return 0;
 }
 
@@ -724,19 +724,19 @@ have_full_symbols ()
 /* This operations deletes all objfile entries that represent solibs that
    weren't explicitly loaded by the user, via e.g., the add-symbol-file
    command.
-   */
+ */
 void
 objfile_purge_solibs ()
 {
-  struct objfile *  objf;
-  struct objfile *  temp;
+  struct objfile *objf;
+  struct objfile *temp;
 
   ALL_OBJFILES_SAFE (objf, temp)
   {
     /* We assume that the solib package has been purged already, or will
        be soon.
-       */
-    if (! objf->user_loaded && objf->is_solib)
+     */
+    if (!objf->user_loaded && objf->is_solib)
       free_objfile (objf);
   }
 }
@@ -752,12 +752,12 @@ have_minimal_symbols ()
   struct objfile *ofp;
 
   ALL_OBJFILES (ofp)
-    {
-      if (ofp -> msymbols != NULL)
-	{
-	  return 1;
-	}
-    }
+  {
+    if (ofp->msymbols != NULL)
+      {
+	return 1;
+      }
+  }
   return 0;
 }
 
@@ -914,8 +914,8 @@ map_to_file (fd)
 	  if (mapto != 0)
 	    {
 	      /* To avoid reusing the freshly created mapping file, at the 
-		 address selected by mmap, we must truncate it before trying
-		 to do an attach at the address we want. */
+	         address selected by mmap, we must truncate it before trying
+	         to do an attach at the address we want. */
 	      ftruncate (fd, 0);
 	      md = mmalloc_attach (fd, (PTR) mapto);
 	      if (md != NULL)
@@ -928,7 +928,7 @@ map_to_file (fd)
   return (md);
 }
 
-#endif	/* defined(USE_MMALLOC) && defined(HAVE_MMAP) */
+#endif /* defined(USE_MMALLOC) && defined(HAVE_MMAP) */
 
 /* Returns a section whose range includes PC and SECTION, 
    or NULL if none found.  Note the distinction between the return type, 
@@ -943,48 +943,48 @@ find_pc_sect_section (pc, section)
 {
   struct obj_section *s;
   struct objfile *objfile;
-  
+
   ALL_OBJFILES (objfile)
     for (s = objfile->sections; s < objfile->sections_end; ++s)
 #if defined(HPUXHPPA)
-      if ((section == 0 || section == s->the_bfd_section) && 
-	  s->addr <= pc && pc <= s->endaddr)
+    if ((section == 0 || section == s->the_bfd_section) &&
+	s->addr <= pc && pc <= s->endaddr)
 #else
-      if ((section == 0 || section == s->the_bfd_section) && 
-	  s->addr <= pc && pc < s->endaddr)
+    if ((section == 0 || section == s->the_bfd_section) &&
+	s->addr <= pc && pc < s->endaddr)
 #endif
-	return(s);
+      return (s);
 
-  return(NULL);
+  return (NULL);
 }
 
 /* Returns a section whose range includes PC or NULL if none found. 
    Backward compatibility, no section.  */
 
 struct obj_section *
-find_pc_section(pc)
+find_pc_section (pc)
      CORE_ADDR pc;
 {
   return find_pc_sect_section (pc, find_pc_mapped_section (pc));
 }
-  
+
 
 /* In SVR4, we recognize a trampoline by it's section name. 
    That is, if the pc is in a section named ".plt" then we are in
    a trampoline.  */
 
 int
-in_plt_section(pc, name)
+in_plt_section (pc, name)
      CORE_ADDR pc;
      char *name;
 {
   struct obj_section *s;
   int retval = 0;
-  
-  s = find_pc_section(pc);
-  
+
+  s = find_pc_section (pc);
+
   retval = (s != NULL
 	    && s->the_bfd_section->name != NULL
 	    && STREQ (s->the_bfd_section->name, ".plt"));
-  return(retval);
+  return (retval);
 }