diff options
Diffstat (limited to 'gdb/gdbserver')
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/gdbserver/linux-low.c | 13 |
2 files changed, 7 insertions, 10 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 3bd9a68..4e55c36 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,7 @@ +2018-06-08 Tom Tromey <tom@tromey.com> + + * linux-low.c (linux_low_read_btrace): Update. + 2018-06-04 Stan Cox <scox@redhat.com> * server.h (struct client_state): New. diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index f8507b7..1211944 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -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. */ |