OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove a cleanup from trace_dump_actions

Browse Source 
This changes trace_dump_actions to use std::string, removing a
cleanup.

Tested by the buildbot.

ChangeLog
2018-05-21  Tom Tromey  <tom@tromey.com>

	* tracepoint.c (trace_dump_actions): Use std::string.
This commit is contained in:
Tom Tromey 2018-05-18 14:23:27 -06:00
parent c0c9f665d9
commit 15b6611c69
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdb/ChangeLog
View File

@ -1,3 +1,7 @@
2018-05-21 Tom Tromey <tom@tromey.com>
* tracepoint.c (trace_dump_actions): Use std::string.
2018-05-21 Tom Tromey <tom@tromey.com>
* symfile.c (reread_symbols): Use std::string for original_name.

24
gdb/tracepoint.c
View File

@ -2679,9 +2679,6 @@ trace_dump_actions (struct command_line *action,
STEPPING_ACTIONS should be equal. */
if (stepping_frame == stepping_actions)
{
char *cmd = NULL;
struct cleanup *old_chain
= make_cleanup (free_current_contents, &cmd);
int trace_string = 0;
if (*action_exp == '/')
@ -2706,31 +2703,22 @@ trace_dump_actions (struct command_line *action,
info_args_command (NULL, from_tty);
else
{ /* variable */
std::string contents;
const char *exp = action_exp;
if (next_comma != NULL)
{
size_t len = next_comma - action_exp;
cmd = (char *) xrealloc (cmd, len + 1);
memcpy (cmd, action_exp, len);
cmd[len] = 0;
}
else
{
size_t len = strlen (action_exp);
cmd = (char *) xrealloc (cmd, len + 1);
memcpy (cmd, action_exp, len + 1);
contents = std::string (action_exp, len);
exp = contents.c_str ();
}
printf_filtered ("%s = ", cmd);
output_command_const (cmd, from_tty);
printf_filtered ("%s = ", exp);
output_command_const (exp, from_tty);
printf_filtered ("\n");
}
action_exp = next_comma;
}
while (action_exp && *action_exp == ',');
do_cleanups (old_chain);
}
}
}