Mon Nov 9 18:22:55 1998 Dave Brolley <brolley@cygnus.com>

[deliverable/binutils-gdb.git] / gdb / nlmread.c

diff --git a/gdb/nlmread.c b/gdb/nlmread.c
index bc16d004a7e8dc85f29706efbca04f4c33a7d155..afdea43a6b0131b7e8ca48ac199d4807f073761f 100644 (file)
--- a/gdb/nlmread.c
+++ b/gdb/nlmread.c
@@ -1,5 +1,5 @@
 /* Read NLM (NetWare Loadable Module) format executable files for GDB.
-   Copyright 1993, 1994 Free Software Foundation, Inc.
+   Copyright 1993, 1994, 1998 Free Software Foundation, Inc.
    Written by Fred Fish at Cygnus Support (fnf@cygnus.com).
 
 This file is part of GDB.
@@ -43,11 +43,6 @@ nlm_symfile_finish PARAMS ((struct objfile *));
 static void
 nlm_symtab_read PARAMS ((bfd *,  CORE_ADDR, struct objfile *));
 
-static void
-record_minimal_symbol PARAMS ((char *, CORE_ADDR, enum minimal_symbol_type,
-                              struct objfile *));
-
-
 /* Initialize anything that needs initializing when a completely new symbol
    file is specified (not just adding some symbols from another file, e.g. a
    shared library).
@@ -79,18 +74,6 @@ nlm_symfile_init (ignore)
 {
 }
 
-static void
-record_minimal_symbol (name, address, ms_type, objfile)
-     char *name;
-     CORE_ADDR address;
-     enum minimal_symbol_type ms_type;
-     struct objfile *objfile;
-{
-  name = obsavestring (name, strlen (name), &objfile -> symbol_obstack);
-  prim_record_minimal_symbol (name, address, ms_type, objfile);
-}
-
-
 /*
 
 LOCAL FUNCTION
@@ -159,8 +142,8 @@ nlm_symtab_read (abfd, addr, objfile)
              else
                ms_type = mst_unknown;
 
-             record_minimal_symbol ((char *) sym -> name, symaddr, ms_type,
-                                    objfile);
+             prim_record_minimal_symbol (sym -> name, symaddr, ms_type,
+                                         objfile);
            }
        }
       do_cleanups (back_to);
@@ -207,7 +190,7 @@ nlm_symfile_read (objfile, section_offsets, mainline)
   struct symbol *mainsym;
 
   init_minimal_symbol_collection ();
-  back_to = make_cleanup (discard_minimal_symbols, 0);
+  back_to = make_cleanup ((make_cleanup_func) discard_minimal_symbols, 0);
 
   /* FIXME, should take a section_offsets param, not just an offset.  */