diff options
| author | Tom Tromey <tom@tromey.com> | 2018-02-06 01:02:00 +0100 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2018-02-08 11:46:55 -0700 |
| commit | f6c2623eb8ac7296b6d7a76657394272a71f5aee (patch) | |
| tree | 7a83749c7e88dc681929f784c2896dc369aa2d1a /gdb/macroscope.h | |
| parent | 8ce47547b34fddec16d1ccd801f025a56976af95 (diff) | |
| download | gdb-f6c2623eb8ac7296b6d7a76657394272a71f5aee.zip gdb-f6c2623eb8ac7296b6d7a76657394272a71f5aee.tar.gz gdb-f6c2623eb8ac7296b6d7a76657394272a71f5aee.tar.bz2 | |
Return unique_xmalloc_ptr from macro scope functions
This changes the macro scope functions (sal_macro_scope,
user_macro_scope, and default_macro_scope) to return a
unique_xmalloc_ptr, then fixes up the users. This allowed for the
removal of several cleanups.
2018-02-08 Tom Tromey <tom@tromey.com>
* symtab.c (default_collect_symbol_completion_matches_break_on):
Use unique_xmalloc_ptr.
* macroscope.h: (sal_macro_scope, user_macro_scope)
(default_macro_scope): Return unique_xmalloc_ptr.
* macroscope.c (sal_macro_scope, user_macro_scope)
(default_macro_scope): Return unique_xmalloc_ptr.
* macroexp.h (macro_expand, macro_expand_once): Return
unique_xmalloc_ptr.
* macroexp.c (macro_expand, macro_expand_once): Return
unique_xmalloc_ptr.
* macrocmd.c (macro_expand_command, macro_expand_once_command)
(info_macro_command, info_macros_command): Use
unique_xmalloc_ptr.
* compile/compile-c-support.c (write_macro_definitions): Use
unique_xmalloc_ptr.
* c-exp.y (c_parse): Use unique_xmalloc_ptr.
Diffstat (limited to 'gdb/macroscope.h')
| -rw-r--r-- | gdb/macroscope.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/gdb/macroscope.h b/gdb/macroscope.h index 3bd1c9e..00fa98a 100644 --- a/gdb/macroscope.h +++ b/gdb/macroscope.h @@ -39,13 +39,13 @@ struct macro_scope { /* Return a `struct macro_scope' object corresponding to the symtab and line given in SAL. If we have no macro information for that location, or if SAL's pc is zero, return zero. */ -struct macro_scope *sal_macro_scope (struct symtab_and_line sal); +gdb::unique_xmalloc_ptr<struct macro_scope> sal_macro_scope + (struct symtab_and_line sal); /* Return a `struct macro_scope' object representing just the - user-defined macros. The result is allocated using xmalloc; the - caller is responsible for freeing it. */ -struct macro_scope *user_macro_scope (void); + user-defined macros. */ +gdb::unique_xmalloc_ptr<struct macro_scope> user_macro_scope (void); /* Return a `struct macro_scope' object describing the scope the `macro expand' and `macro expand-once' commands should use for looking up @@ -53,11 +53,8 @@ struct macro_scope *user_macro_scope (void); its PC; otherwise, this is the last listing position. If we have no macro information for the current location, return - the user macro scope. - - The object returned is allocated using xmalloc; the caller is - responsible for freeing it. */ -struct macro_scope *default_macro_scope (void); + the user macro scope. */ +gdb::unique_xmalloc_ptr<struct macro_scope> default_macro_scope (void); /* Look up the definition of the macro named NAME in scope at the source |