OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use std::string in ctf_start 

This changes ctf_start to use std::string, allowing for some cleanup
removal.

ChangeLog
2017-09-11  Tom Tromey  <tom@tromey.com>

	* ctf.c (ctf_start): Use std::string.
This commit is contained in:
Tom Tromey 2017-09-09 10:17:11 -06:00
parent c6dc63a162
commit 50feb4bd43
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gdb/ChangeLog
View File

@ -1,3 +1,7 @@
2017-09-11 Tom Tromey <tom@tromey.com>
* ctf.c (ctf_start): Use std::string.
2017-09-11 Tom Tromey <tom@tromey.com>
* ada-lang.c (is_known_support_routine): Update.

18
gdb/ctf.c
View File

@ -311,8 +311,6 @@ ctf_target_save (struct trace_file_writer *self,
static void
ctf_start (struct trace_file_writer *self, const char *dirname)
{
char *file_name;
struct cleanup *old_chain;
struct ctf_trace_file_writer *writer
= (struct ctf_trace_file_writer *) self;
int i;
@ -325,24 +323,20 @@ ctf_start (struct trace_file_writer *self, const char *dirname)
memset (&writer->tcs, '\0', sizeof (writer->tcs));
file_name = xstrprintf ("%s/%s", dirname, CTF_METADATA_NAME);
old_chain = make_cleanup (xfree, file_name);
std::string file_name = string_printf ("%s/%s", dirname, CTF_METADATA_NAME);
writer->tcs.metadata_fd = fopen (file_name, "w");
writer->tcs.metadata_fd = fopen (file_name.c_str (), "w");
if (writer->tcs.metadata_fd == NULL)
error (_("Unable to open file '%s' for saving trace data (%s)"),
file_name, safe_strerror (errno));
do_cleanups (old_chain);
file_name.c_str (), safe_strerror (errno));
ctf_save_metadata_header (&writer->tcs);
file_name = xstrprintf ("%s/%s", dirname, CTF_DATASTREAM_NAME);
old_chain = make_cleanup (xfree, file_name);
writer->tcs.datastream_fd = fopen (file_name, "w");
file_name = string_printf ("%s/%s", dirname, CTF_DATASTREAM_NAME);
writer->tcs.datastream_fd = fopen (file_name.c_str (), "w");
if (writer->tcs.datastream_fd == NULL)
error (_("Unable to open file '%s' for saving trace data (%s)"),
file_name, safe_strerror (errno));
do_cleanups (old_chain);
file_name.c_str (), safe_strerror (errno));
}
/* This is the implementation of trace_file_write_ops method