* ld-selective/selective.exp <no CXX>: Fix typo for argument to

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

diff --git a/gdb/nlmread.c b/gdb/nlmread.c
index 71018ddae9d549d81de8710ba2e43db9bb541a29..dcc95d912bb2dd908be8933dc1573960f811f5e0 100644 (file)
--- a/gdb/nlmread.c
+++ b/gdb/nlmread.c
@@ -29,22 +29,17 @@
 #include "buildsym.h"
 #include "stabsread.h"
 
-extern void _initialize_nlmread PARAMS ((void));
+extern void _initialize_nlmread (void);
 
-static void
-nlm_new_init PARAMS ((struct objfile *));
+static void nlm_new_init (struct objfile *);
 
-static void
-nlm_symfile_init PARAMS ((struct objfile *));
+static void nlm_symfile_init (struct objfile *);
 
-static void
-nlm_symfile_read PARAMS ((struct objfile *, struct section_offsets *, int));
+static void nlm_symfile_read (struct objfile *, int);
 
-static void
-nlm_symfile_finish PARAMS ((struct objfile *));
+static void nlm_symfile_finish (struct objfile *);
 
-static void
-nlm_symtab_read PARAMS ((bfd *, CORE_ADDR, struct objfile *));
+static void nlm_symtab_read (bfd *, CORE_ADDR, 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
@@ -54,8 +49,7 @@ nlm_symtab_read PARAMS ((bfd *, CORE_ADDR, struct objfile *));
    file at some point in the near future.  */
 
 static void
-nlm_new_init (ignore)
-     struct objfile *ignore;
+nlm_new_init (struct objfile *ignore)
 {
   stabsread_new_init ();
   buildsym_new_init ();
@@ -72,8 +66,7 @@ nlm_new_init (ignore)
    just a stub. */
 
 static void
-nlm_symfile_init (ignore)
-     struct objfile *ignore;
+nlm_symfile_init (struct objfile *ignore)
 {
 }
 
@@ -97,10 +90,7 @@ nlm_symfile_init (ignore)
  */
 
 static void
-nlm_symtab_read (abfd, addr, objfile)
-     bfd *abfd;
-     CORE_ADDR addr;
-     struct objfile *objfile;
+nlm_symtab_read (bfd *abfd, CORE_ADDR addr, struct objfile *objfile)
 {
   long storage_needed;
   asymbol *sym;
@@ -182,10 +172,7 @@ nlm_symtab_read (abfd, addr, objfile)
    is not currently used. */
 
 static void
-nlm_symfile_read (objfile, section_offsets, mainline)
-     struct objfile *objfile;
-     struct section_offsets *section_offsets;
-     int mainline;
+nlm_symfile_read (struct objfile *objfile, int mainline)
 {
   bfd *abfd = objfile->obfd;
   struct cleanup *back_to;
@@ -193,18 +180,18 @@ nlm_symfile_read (objfile, section_offsets, mainline)
   struct symbol *mainsym;
 
   init_minimal_symbol_collection ();
-  back_to = make_cleanup ((make_cleanup_func) discard_minimal_symbols, 0);
+  back_to = make_cleanup_discard_minimal_symbols ();
 
   /* FIXME, should take a section_offsets param, not just an offset.  */
 
-  offset = ANOFFSET (section_offsets, 0);
+  offset = ANOFFSET (objfile->section_offsets, 0);
 
   /* Process the NLM export records, which become the bfd's canonical symbol
      table. */
 
   nlm_symtab_read (abfd, offset, objfile);
 
-  stabsect_build_psymtabs (objfile, section_offsets, mainline, ".stab",
+  stabsect_build_psymtabs (objfile, mainline, ".stab",
                           ".stabstr", ".text");
 
   mainsym = lookup_symbol ("main", NULL, VAR_NAMESPACE, NULL, NULL);
@@ -234,8 +221,7 @@ nlm_symfile_read (objfile, section_offsets, mainline)
    objfile struct from the global list of known objfiles. */
 
 static void
-nlm_symfile_finish (objfile)
-     struct objfile *objfile;
+nlm_symfile_finish (struct objfile *objfile)
 {
   if (objfile->sym_private != NULL)
     {
@@ -252,13 +238,12 @@ static struct sym_fns nlm_sym_fns =
   nlm_symfile_init,            /* sym_init: read initial info, setup for sym_read() */
   nlm_symfile_read,            /* sym_read: read a symbol file into symtab */
   nlm_symfile_finish,          /* sym_finish: finished with file, cleanup */
-  default_symfile_offsets,
-                       /* sym_offsets:  Translate ext. to int. relocation */
+  default_symfile_offsets,     /* sym_offsets:  Translate ext. to int. relocation */
   NULL                         /* next: pointer to next struct sym_fns */
 };
 
 void
-_initialize_nlmread ()
+_initialize_nlmread (void)
 {
   add_symtab_fns (&nlm_sym_fns);
 }