espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-27 14:39:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use ui_file_as_string in gdb/infrun.c

Browse Source 
gdb/ChangeLog:
2016-11-08  Pedro Alves  <palves@redhat.com>

	* infrun.c (print_target_wait_results): Use ui_file_as_string and
	std::string.
This commit is contained in:
Pedro Alves
2016-11-08 15:26:46 +00:00
parent 3b4de39c9d
commit af1fe7b3b8
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2016-11-08 Pedro Alves <palves@redhat.com>
* infrun.c (print_target_wait_results): Use ui_file_as_string and
std::string.
2016-11-08 Pedro Alves <palves@redhat.com> 2016-11-08 Pedro Alves <palves@redhat.com>
* ada-lang.c (type_as_string): Use ui_file_as_string and return * ada-lang.c (type_as_string): Use ui_file_as_string and return

6
gdb/infrun.c
View File

@ -3437,7 +3437,6 @@ print_target_wait_results (ptid_t waiton_ptid, ptid_t result_ptid,
{ {
char *status_string = target_waitstatus_to_string (ws); char *status_string = target_waitstatus_to_string (ws);
struct ui_file *tmp_stream = mem_fileopen (); struct ui_file *tmp_stream = mem_fileopen ();
char *text;
/* The text is split over several lines because it was getting too long. /* The text is split over several lines because it was getting too long.
Call fprintf_unfiltered (gdb_stdlog) once so that the text is still Call fprintf_unfiltered (gdb_stdlog) once so that the text is still
@ -3463,14 +3462,13 @@ print_target_wait_results (ptid_t waiton_ptid, ptid_t result_ptid,
"infrun: %s\n", "infrun: %s\n",
status_string); status_string);
text = ui_file_xstrdup (tmp_stream, NULL); std::string text = ui_file_as_string (tmp_stream);
/* This uses %s in part to handle %'s in the text, but also to avoid /* This uses %s in part to handle %'s in the text, but also to avoid
a gcc error: the format attribute requires a string literal. */ a gcc error: the format attribute requires a string literal. */
fprintf_unfiltered (gdb_stdlog, "%s", text); fprintf_unfiltered (gdb_stdlog, "%s", text.c_str ());
xfree (status_string); xfree (status_string);
xfree (text);
ui_file_delete (tmp_stream); ui_file_delete (tmp_stream);
} }