diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9e65878c49..6d46e63a6a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2016-04-19 Doug Evans + + * symmisc.c (dump_symtab_1, dump_symtab): Delete arg objfile. + All callers updated. + 2016-04-19 Doug Evans * source.c (is_regular_file): New arg errno_ptr. diff --git a/gdb/symmisc.c b/gdb/symmisc.c index 88daf09ec3..a0652ffb4c 100644 --- a/gdb/symmisc.c +++ b/gdb/symmisc.c @@ -282,9 +282,9 @@ dump_msymbols (struct objfile *objfile, struct ui_file *outfile) } static void -dump_symtab_1 (struct objfile *objfile, struct symtab *symtab, - struct ui_file *outfile) +dump_symtab_1 (struct symtab *symtab, struct ui_file *outfile) { + struct objfile *objfile = SYMTAB_OBJFILE (symtab); struct gdbarch *gdbarch = get_objfile_arch (objfile); int i; struct dict_iterator iter; @@ -382,8 +382,7 @@ dump_symtab_1 (struct objfile *objfile, struct symtab *symtab, } static void -dump_symtab (struct objfile *objfile, struct symtab *symtab, - struct ui_file *outfile) +dump_symtab (struct symtab *symtab, struct ui_file *outfile) { /* Set the current language to the language of the symtab we're dumping because certain routines used during dump_symtab() use the current @@ -396,12 +395,12 @@ dump_symtab (struct objfile *objfile, struct symtab *symtab, saved_lang = set_language (symtab->language); - dump_symtab_1 (objfile, symtab, outfile); + dump_symtab_1 (symtab, outfile); set_language (saved_lang); } else - dump_symtab_1 (objfile, symtab, outfile); + dump_symtab_1 (symtab, outfile); } static void @@ -449,7 +448,7 @@ maintenance_print_symbols (char *args, int from_tty) QUIT; if (symname == NULL || filename_cmp (symname, symtab_to_filename_for_display (s)) == 0) - dump_symtab (objfile, s, outfile); + dump_symtab (s, outfile); } do_cleanups (cleanups); }