Remove a cleanup from trace_dump_actions
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:
parent
c0c9f665d9
commit
15b6611c69
|
@ -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>
|
2018-05-21 Tom Tromey <tom@tromey.com>
|
||||||
|
|
||||||
* symfile.c (reread_symbols): Use std::string for original_name.
|
* symfile.c (reread_symbols): Use std::string for original_name.
|
||||||
|
|
|
@ -2679,9 +2679,6 @@ trace_dump_actions (struct command_line *action,
|
||||||
STEPPING_ACTIONS should be equal. */
|
STEPPING_ACTIONS should be equal. */
|
||||||
if (stepping_frame == stepping_actions)
|
if (stepping_frame == stepping_actions)
|
||||||
{
|
{
|
||||||
char *cmd = NULL;
|
|
||||||
struct cleanup *old_chain
|
|
||||||
= make_cleanup (free_current_contents, &cmd);
|
|
||||||
int trace_string = 0;
|
int trace_string = 0;
|
||||||
|
|
||||||
if (*action_exp == '/')
|
if (*action_exp == '/')
|
||||||
|
@ -2706,31 +2703,22 @@ trace_dump_actions (struct command_line *action,
|
||||||
info_args_command (NULL, from_tty);
|
info_args_command (NULL, from_tty);
|
||||||
else
|
else
|
||||||
{ /* variable */
|
{ /* variable */
|
||||||
|
std::string contents;
|
||||||
|
const char *exp = action_exp;
|
||||||
if (next_comma != NULL)
|
if (next_comma != NULL)
|
||||||
{
|
{
|
||||||
size_t len = next_comma - action_exp;
|
size_t len = next_comma - action_exp;
|
||||||
|
contents = std::string (action_exp, len);
|
||||||
cmd = (char *) xrealloc (cmd, len + 1);
|
exp = contents.c_str ();
|
||||||
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);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
printf_filtered ("%s = ", cmd);
|
printf_filtered ("%s = ", exp);
|
||||||
output_command_const (cmd, from_tty);
|
output_command_const (exp, from_tty);
|
||||||
printf_filtered ("\n");
|
printf_filtered ("\n");
|
||||||
}
|
}
|
||||||
action_exp = next_comma;
|
action_exp = next_comma;
|
||||||
}
|
}
|
||||||
while (action_exp && *action_exp == ',');
|
while (action_exp && *action_exp == ',');
|
||||||
|
|
||||||
do_cleanups (old_chain);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue