forked from Imagelibrary/binutils-gdb
Remove cleanups from btrace code
This removes some cleanups from the btrace code by minorly C++-ifying struct btrace_data. gdb/ChangeLog 2018-06-08 Tom Tromey <tom@tromey.com> * common/btrace-common.h (struct btrace_data): Add constructor, destructor, move assignment operator. <empty, clear, fini>: New methods. <format>: Initialize. (btrace_data_init, btrace_data_fini, btrace_data_clear) (btrace_data_empty): Don't declare. * common/btrace-common.c (btrace_data_init): Remove. (btrace_data::fini): Rename from btrace_data_fini. (btrace_data::empty): Rename from btrace_data_empty. (btrace_data::clear): Rename from btrace_data_clear. Return bool. * btrace.h (make_cleanup_btrace_data): Don't declare. * btrace.c (btrace_add_pc, btrace_stitch_trace, btrace_clear) (parse_xml_btrace): Update. (do_btrace_data_cleanup, make_cleanup_btrace_data): Remove. (maint_btrace_clear_packet_history_cmd): Update. gdb/gdbserver/ChangeLog 2018-06-08 Tom Tromey <tom@tromey.com> * linux-low.c (linux_low_read_btrace): Update.
This commit is contained in:
@@ -7250,8 +7250,6 @@ linux_low_read_btrace (struct btrace_target_info *tinfo, struct buffer *buffer,
|
||||
enum btrace_error err;
|
||||
int i;
|
||||
|
||||
btrace_data_init (&btrace);
|
||||
|
||||
err = linux_read_btrace (&btrace, tinfo, type);
|
||||
if (err != BTRACE_ERR_NONE)
|
||||
{
|
||||
@@ -7260,14 +7258,14 @@ linux_low_read_btrace (struct btrace_target_info *tinfo, struct buffer *buffer,
|
||||
else
|
||||
buffer_grow_str0 (buffer, "E.Generic Error.");
|
||||
|
||||
goto err;
|
||||
return -1;
|
||||
}
|
||||
|
||||
switch (btrace.format)
|
||||
{
|
||||
case BTRACE_FORMAT_NONE:
|
||||
buffer_grow_str0 (buffer, "E.No Trace.");
|
||||
goto err;
|
||||
return -1;
|
||||
|
||||
case BTRACE_FORMAT_BTS:
|
||||
buffer_grow_str (buffer, "<!DOCTYPE btrace SYSTEM \"btrace.dtd\">\n");
|
||||
@@ -7298,15 +7296,10 @@ linux_low_read_btrace (struct btrace_target_info *tinfo, struct buffer *buffer,
|
||||
|
||||
default:
|
||||
buffer_grow_str0 (buffer, "E.Unsupported Trace Format.");
|
||||
goto err;
|
||||
return -1;
|
||||
}
|
||||
|
||||
btrace_data_fini (&btrace);
|
||||
return 0;
|
||||
|
||||
err:
|
||||
btrace_data_fini (&btrace);
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* See to_btrace_conf target method. */
|
||||
|
||||
Reference in New Issue
Block a user