* {dbxread.c, dwarfread.c} (read_ofile_symtab): Rewrite to take

	single parameter, the pointer to the partial symtab, rather than
	a bunch of args that are derived from the partial symtab.  Change
	prototypes and callers to match.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8fa2a3f4d2b0aa75de62252c83d50fbe8c17bda0..7a5b6cf220f685a268ca916c14998d5d9449afd4 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 Sun May 30 15:35:21 1993  Fred Fish  (fnf@cygnus.com)
 
+       * {dbxread.c, dwarfread.c} (read_ofile_symtab):  Rewrite to take
+       single parameter, the pointer to the partial symtab, rather than
+       a bunch of args that are derived from the partial symtab.  Change
+       prototypes and callers to match.
+
        * dbxread.c (read_ofile_symtab):  Remove "#if 1" around code to
        set demangling style automatically.
        * defs.h (CPLUS_MARKER):  Clarify comment that this is only for

diff --git a/gdb/dwarfread.c b/gdb/dwarfread.c
index 5dc0c30717f3d855f25e3384baccf5239ed96e56..b9872229e155a23c90cf1a61a8c8d585f544b9b2 100644 (file)
--- a/gdb/dwarfread.c
+++ b/gdb/dwarfread.c
@@ -495,7 +495,7 @@ dwarf_psymtab_to_symtab PARAMS ((struct partial_symtab *));
 static void
 psymtab_to_symtab_1 PARAMS ((struct partial_symtab *));
 
-static struct symtab *
+static void
 read_ofile_symtab PARAMS ((struct partial_symtab *));
 
 static void
@@ -2300,19 +2300,18 @@ LOCAL FUNCTION
 
 SYNOPSIS
 
-       static struct symtab *read_ofile_symtab (struct partial_symtab *pst)
+       static void read_ofile_symtab (struct partial_symtab *pst)
 
 DESCRIPTION
 
        When expanding a partial symbol table entry to a full symbol table
        entry, this is the function that gets called to read in the symbols
-       for the compilation unit.
-
-       Returns a pointer to the newly constructed symtab (which is now
-       the new first one on the objfile's symtab list).
+       for the compilation unit.  A pointer to the newly constructed symtab,
+       which is now the new first one on the objfile's symtab list, is
+       stashed in the partial symbol table entry.
  */
 
-static struct symtab *
+static void
 read_ofile_symtab (pst)
      struct partial_symtab *pst;
 {
@@ -2372,7 +2371,7 @@ read_ofile_symtab (pst)
   process_dies (dbbase, dbbase + dbsize, pst -> objfile);
   do_cleanups (back_to);
   current_objfile = NULL;
-  return (pst -> objfile -> symtabs);
+  pst -> symtab = pst -> objfile -> symtabs;
 }
 
 /*
@@ -2432,7 +2431,7 @@ psymtab_to_symtab_1 (pst)
            {
              buildsym_init ();
              old_chain = make_cleanup (really_free_pendings, 0);
-             pst -> symtab = read_ofile_symtab (pst);
+             read_ofile_symtab (pst);
              if (info_verbose)
                {
                  printf_filtered ("%d DIE's, sorting...", diecount);