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/macroexp.c | |
| 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/macroexp.c')
| -rw-r--r-- | gdb/macroexp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gdb/macroexp.c b/gdb/macroexp.c index 8a2df1e..aefb13a 100644 --- a/gdb/macroexp.c +++ b/gdb/macroexp.c @@ -1485,7 +1485,7 @@ scan (struct macro_buffer *dest, } -char * +gdb::unique_xmalloc_ptr<char> macro_expand (const char *source, macro_lookup_ftype *lookup_func, void *lookup_func_baton) @@ -1504,11 +1504,11 @@ macro_expand (const char *source, appendc (&dest, '\0'); discard_cleanups (back_to); - return dest.text; + return gdb::unique_xmalloc_ptr<char> (dest.text); } -char * +gdb::unique_xmalloc_ptr<char> macro_expand_once (const char *source, macro_lookup_ftype *lookup_func, void *lookup_func_baton) |