espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-26 22:07:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use std::string in mi-main.c

Browse Source 
Change a couple of spots in mi-main.c to use std::string, and change
one place to use field_fmt.  This removes some cleanups.

gdb/ChangeLog
2017-09-29  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.
This commit is contained in:
Tom Tromey
2017-05-04 16:01:41 -06:00
parent 45d288cc64
commit dcd5ddccd7
2 changed files with 16 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@ -1,3 +1,9 @@
2017-09-29 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-29 Tom Tromey <tom@tromey.com> 2017-09-29 Tom Tromey <tom@tromey.com>
* mi/mi-main.c (mi_cmd_data_write_memory_bytes): Use * mi/mi-main.c (mi_cmd_data_write_memory_bytes): Use

41
gdb/mi/mi-main.c
View File

@ -2269,41 +2269,29 @@ mi_execute_cli_command (const char *cmd, int args_p, const char *args)
{ {
if (cmd != 0) if (cmd != 0)
{ {
struct cleanup *old_cleanups; std::string run = cmd;
char *run;
if (args_p) if (args_p)
run = xstrprintf ("%s %s", cmd, args); run = run + " " + args;
else
run = xstrdup (cmd);
if (mi_debug_p) if (mi_debug_p)
/* FIXME: gdb_???? */ /* FIXME: gdb_???? */
fprintf_unfiltered (gdb_stdout, "cli=%s run=%s\n", fprintf_unfiltered (gdb_stdout, "cli=%s run=%s\n",
cmd, run); cmd, run.c_str ());
old_cleanups = make_cleanup (xfree, run); execute_command (&run[0], 0 /* from_tty */ );
execute_command (run, 0 /* from_tty */ );
do_cleanups (old_cleanups);
return;
} }
} }
void void
mi_execute_async_cli_command (const char *cli_command, char **argv, int argc) mi_execute_async_cli_command (const char *cli_command, char **argv, int argc)
{ {
struct cleanup *old_cleanups; std::string run = cli_command;
char *run;
if (argc)
run = run + " " + *argv;
if (mi_async_p ()) if (mi_async_p ())
run = xstrprintf ("%s %s&", cli_command, argc ? *argv : ""); run += "&";
else
run = xstrprintf ("%s %s", cli_command, argc ? *argv : "");
old_cleanups = make_cleanup (xfree, run);
execute_command (run, 0 /* from_tty */ ); execute_command (&run[0], 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);
} }
void void
@ -2806,14 +2794,10 @@ mi_cmd_trace_frame_collected (const char *command, char **argv, int argc)
{ {
struct cleanup *cleanups; struct cleanup *cleanups;
int tvar; int tvar;
char *tsvname;
int i; int i;
ui_out_emit_list list_emitter (uiout, "tvars"); 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++) for (i = 0; VEC_iterate (int, tinfo->tvars, i, tvar); i++)
{ {
struct trace_state_variable *tsv; struct trace_state_variable *tsv;
@ -2824,10 +2808,7 @@ mi_cmd_trace_frame_collected (const char *command, char **argv, int argc)
if (tsv != NULL) if (tsv != NULL)
{ {
tsvname = (char *) xrealloc (tsvname, strlen (tsv->name) + 2); uiout->field_fmt ("name", "$%s", tsv->name);
tsvname[0] = '$';
strcpy (tsvname + 1, tsv->name);
uiout->field_string ("name", tsvname);
tsv->value_known = target_get_trace_state_variable_value (tsv->number, tsv->value_known = target_get_trace_state_variable_value (tsv->number,
&tsv->value); &tsv->value);
@ -2839,8 +2820,6 @@ mi_cmd_trace_frame_collected (const char *command, char **argv, int argc)
uiout->field_skip ("current"); uiout->field_skip ("current");
} }
} }
do_cleanups (cleanups);
} }
/* Memory. */ /* Memory. */