Re: [RFA 08/11] Use string and unique_xmalloc_ptr in mi-main.c

Tom Tromey
2017-09-29T01:42:59Z

>>>>> "Pedro" == Pedro Alves <palves@redhat.com> writes:

Pedro> How about replacing this string building + field_string with a single
Pedro> call to:
Pedro> uiout-> field_fmt ("name", "$%s", tsv->name);

Here's an update.

Tom

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9cd584b..1edd8ee 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
2017-09-12 Tom Tromey <tom@tromey.com>

+ * mi/mi-main.c (mi_execute_cli_command): Use std::string.
+ (mi_execute_async_cli_command): Likewise.
+ (mi_cmd_trace_frame_collected): Use field_fmt.
+
+2017-09-12 Tom Tromey <tom@tromey.com>
+
* mi/mi-main.c (mi_cmd_data_write_memory_bytes): Use
gdb::byte_vector.

diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index e1ba8e2..2d560a4 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -2269,41 +2269,29 @@ mi_execute_cli_command (const char *cmd, int args_p, const char *args)
{
if (cmd != 0)
{
- struct cleanup *old_cleanups;
- char *run;
+ std::string run = cmd;

if (args_p)
- run = xstrprintf ("%s %s", cmd, args);
- else
- run = xstrdup (cmd);
+ run = run + " " + args;
if (mi_debug_p)
/* FIXME: gdb_???? */
fprintf_unfiltered (gdb_stdout, "cli=%s run=%s\n",
- cmd, run);
- old_cleanups = make_cleanup (xfree, run);
- execute_command (run, 0 /* from_tty */ );
- do_cleanups (old_cleanups);
- return;
+ cmd, run.c_str ());
+ execute_command (&run[0], 0 /* from_tty */ );
}
}

void
mi_execute_async_cli_command (const char *cli_command, char **argv, int argc)
{
- struct cleanup *old_cleanups;
- char *run;
+ std::string run = cli_command;

+ if (argc)
+ run = run + " " + *argv;
if (mi_async_p ())
- run = xstrprintf ("%s %s&", cli_command, argc ? *argv : "");
- else
- run = xstrprintf ("%s %s", cli_command, argc ? *argv : "");
- old_cleanups = make_cleanup (xfree, run);
+ run += "&";

- execute_command (run, 0 /* from_tty */ );
-
- /* Do this before doing any printing. It would appear that some
- print code leaves garbage around in the buffer. */
- do_cleanups (old_cleanups);
+ execute_command (&run[0], 0 /* from_tty */ );
}

void
@@ -2806,14 +2794,10 @@ mi_cmd_trace_frame_collected (const char *command, char **argv, int argc)
{
struct cleanup *cleanups;
int tvar;
- char *tsvname;
int i;

ui_out_emit_list list_emitter (uiout, "tvars");

- tsvname = NULL;
- cleanups = make_cleanup (free_current_contents, &tsvname);
-
for (i = 0; VEC_iterate (int, tinfo->tvars, i, tvar); i++)
{
struct trace_state_variable *tsv;
@@ -2824,10 +2808,7 @@ mi_cmd_trace_frame_collected (const char *command, char **argv, int argc)

if (tsv != NULL)
{
- tsvname = (char *) xrealloc (tsvname, strlen (tsv->name) + 2);
- tsvname[0] = '$';
- strcpy (tsvname + 1, tsv->name);
- uiout->field_string ("name", tsvname);
+ uiout->field_fmt ("name", "$%s", tsv->name);

tsv->value_known = target_get_trace_state_variable_value (tsv->number,
&tsv->value);
@@ -2839,8 +2820,6 @@ mi_cmd_trace_frame_collected (const char *command, char **argv, int argc)
uiout->field_skip ("current");
}
}
-
- do_cleanups (cleanups);
}

/* Memory. */