From 15b6611c69f6fdb7a20cd50d33d9acf8c5c32037 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 18 May 2018 14:23:27 -0600 Subject: [PATCH] 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 * tracepoint.c (trace_dump_actions): Use std::string. --- gdb/ChangeLog | 4 ++++ gdb/tracepoint.c | 24 ++++++------------------ 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8c6e5ff4683..e0a6ed40512 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2018-05-21 Tom Tromey + + * tracepoint.c (trace_dump_actions): Use std::string. + 2018-05-21 Tom Tromey * symfile.c (reread_symbols): Use std::string for original_name. diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index e170d704bc9..9261fe2a27f 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -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; + contents = std::string (action_exp, len); + exp = contents.c_str (); } - else - { - size_t len = strlen (action_exp); - cmd = (char *) xrealloc (cmd, len + 1); - memcpy (cmd, action_exp, len + 1); - } - - 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); } } } -- 2.30.2