FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove cleanup from backtrace_command

Browse source 
This removes a cleanup from backtrace_command, replacing it with
std::string.  This patch temporarily changes backtrace_command so that
the parameter is named "args_in" and is immediately constified; this
is fixed again in the constification patch.

gdb/ChangeLog
2017-11-07  Tom Tromey  <tom@tromey.com>

	* stack.c (backtrace_command): Use std::string.
	(backtrace_command_1): Make "count_exp" const.
This commit is contained in:
Tom Tromey 2017-10-12 08:08:00 -06:00
parent 5614fb7720
commit 022643b445
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gdb/ChangeLog
View file

@ -1,3 +1,8 @@
2017-11-07 Tom Tromey <tom@tromey.com>
* stack.c (backtrace_command): Use std::string.
(backtrace_command_1): Make "count_exp" const.
2017-11-07 Tom Tromey <tom@tromey.com> 2017-11-07 Tom Tromey <tom@tromey.com>
* source.c (directory_switch, mod_path, add_path): Constify. * source.c (directory_switch, mod_path, add_path): Constify.

17
gdb/stack.c
View file

@ -1692,7 +1692,7 @@ info_frame_command (char *addr_exp, int from_tty)
frames. */ frames. */
static void static void
backtrace_command_1 (char *count_exp, int show_locals, int no_filters, backtrace_command_1 (const char *count_exp, int show_locals, int no_filters,
int from_tty) int from_tty)
{ {
struct frame_info *fi; struct frame_info *fi;
@ -1844,12 +1844,13 @@ backtrace_command_1 (char *count_exp, int show_locals, int no_filters,
} }
static void static void
backtrace_command (char *arg, int from_tty) backtrace_command (char *arg_in, int from_tty)
{ {
struct cleanup *old_chain = make_cleanup (null_cleanup, NULL);
int fulltrace_arg = -1, arglen = 0, argc = 0, no_filters = -1; int fulltrace_arg = -1, arglen = 0, argc = 0, no_filters = -1;
int user_arg = 0; int user_arg = 0;
const char *arg = arg_in;
std::string reconstructed_arg;
if (arg) if (arg)
{ {
char **argv; char **argv;
@ -1884,17 +1885,15 @@ backtrace_command (char *arg, int from_tty)
{ {
if (arglen > 0) if (arglen > 0)
{ {
arg = (char *) xmalloc (arglen + 1);
make_cleanup (xfree, arg);
arg[0] = 0;
for (i = 0; i < argc; i++) for (i = 0; i < argc; i++)
{ {
if (i != fulltrace_arg && i != no_filters) if (i != fulltrace_arg && i != no_filters)
{ {
strcat (arg, argv[i]); reconstructed_arg += argv[i];
strcat (arg, " "); reconstructed_arg += " ";
} }
} }
arg = reconstructed_arg.c_str ();
} }
else else
arg = NULL; arg = NULL;
@ -1903,8 +1902,6 @@ backtrace_command (char *arg, int from_tty)
backtrace_command_1 (arg, fulltrace_arg >= 0 /* show_locals */, backtrace_command_1 (arg, fulltrace_arg >= 0 /* show_locals */,
no_filters >= 0 /* no frame-filters */, from_tty); no_filters >= 0 /* no frame-filters */, from_tty);
do_cleanups (old_chain);
} }
/* Iterate over the local variables of a block B, calling CB with /* Iterate over the local variables of a block B, calling CB with