projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix crash when exiting TUI with gdb -tui
[deliverable/binutils-gdb.git]
/
gdb
/
macroscope.c
diff --git
a/gdb/macroscope.c
b/gdb/macroscope.c
index a23cac4f7e31b631493a08c1aa18cbff1548bf3c..9a1e7fe633bef24e68b6b2b1f0ad8b4784093d5e 100644
(file)
--- a/
gdb/macroscope.c
+++ b/
gdb/macroscope.c
@@
-1,5
+1,5
@@
/* Functions for deciding which macros are currently in scope.
/* Functions for deciding which macros are currently in scope.
- Copyright (C) 2002
, 2007-2012
Free Software Foundation, Inc.
+ Copyright (C) 2002
-2020
Free Software Foundation, Inc.
Contributed by Red Hat, Inc.
This file is part of GDB.
Contributed by Red Hat, Inc.
This file is part of GDB.
@@
-35,19
+35,21
@@
struct macro_table *macro_user_macros;
struct macro_table *macro_user_macros;
-struct macro_scope *
+gdb::unique_xmalloc_ptr<struct macro_scope>
sal_macro_scope (struct symtab_and_line sal)
{
struct macro_source_file *main_file, *inclusion;
sal_macro_scope (struct symtab_and_line sal)
{
struct macro_source_file *main_file, *inclusion;
- struct
macro_scope *ms
;
+ struct
compunit_symtab *cust
;
- if (! sal.symtab
- || ! sal.symtab->macro_table)
- return 0;
+ if (sal.symtab == NULL)
+ return NULL;
+ cust = SYMTAB_COMPUNIT (sal.symtab);
+ if (COMPUNIT_MACRO_TABLE (cust) == NULL)
+ return NULL;
-
ms = (struct macro_scope *) xmalloc (sizeof (*ms
));
+
gdb::unique_xmalloc_ptr<struct macro_scope> ms (XNEW (struct macro_scope
));
- main_file = macro_main (
sal.symtab->macro_table
);
+ main_file = macro_main (
COMPUNIT_MACRO_TABLE (cust)
);
inclusion = macro_lookup_inclusion (main_file, sal.symtab->filename);
if (inclusion)
inclusion = macro_lookup_inclusion (main_file, sal.symtab->filename);
if (inclusion)
@@
-74,32
+76,29
@@
sal_macro_scope (struct symtab_and_line sal)
ms->file = main_file;
ms->line = -1;
ms->file = main_file;
ms->line = -1;
- complaint (&symfile_complaints,
- _("symtab found for `%s', but that file\n"
+ complaint (_("symtab found for `%s', but that file\n"
"is not covered in the compilation unit's macro information"),
"is not covered in the compilation unit's macro information"),
- s
al.symtab->filename
);
+ s
ymtab_to_filename_for_display (sal.symtab)
);
}
return ms;
}
}
return ms;
}
-struct macro_scope *
+gdb::unique_xmalloc_ptr<struct macro_scope>
user_macro_scope (void)
{
user_macro_scope (void)
{
- struct macro_scope *ms;
-
- ms = XNEW (struct macro_scope);
+ gdb::unique_xmalloc_ptr<struct macro_scope> ms (XNEW (struct macro_scope));
ms->file = macro_main (macro_user_macros);
ms->line = -1;
return ms;
}
ms->file = macro_main (macro_user_macros);
ms->line = -1;
return ms;
}
-struct macro_scope *
+gdb::unique_xmalloc_ptr<struct macro_scope>
default_macro_scope (void)
{
struct symtab_and_line sal;
default_macro_scope (void)
{
struct symtab_and_line sal;
-
struct macro_scope *
ms;
+
gdb::unique_xmalloc_ptr<struct macro_scope>
ms;
struct frame_info *frame;
CORE_ADDR pc;
struct frame_info *frame;
CORE_ADDR pc;
@@
-153,13
+152,11
@@
standard_macro_lookup (const char *name, void *baton)
return result;
}
return result;
}
-/* Provide a prototype to silence -Wmissing-prototypes. */
-extern initialize_file_ftype _initialize_macroscope;
-
+void _initialize_macroscope ();
void
void
-_initialize_macroscope (
void
)
+_initialize_macroscope ()
{
{
- macro_user_macros = new_macro_table (
0, 0
);
+ macro_user_macros = new_macro_table (
NULL, NULL, NULL
);
macro_set_main (macro_user_macros, "<user-defined>");
macro_allow_redefinitions (macro_user_macros);
}
macro_set_main (macro_user_macros, "<user-defined>");
macro_allow_redefinitions (macro_user_macros);
}
This page took
0.04452 seconds
and
4
git commands to generate.