diff options
author | Tom Tromey <tom@tromey.com> | 2017-04-12 08:23:08 -0600 |
---|---|---|
committer | Tom Tromey <tom@tromey.com> | 2017-04-22 09:46:58 -0600 |
commit | 2e78302469502f4f8a98144b60c09d4d9b6438fd (patch) | |
tree | 83731a2a166c64c77a427975eb13f05339f2e3cb /gdb/record-btrace.c | |
parent | a8cc8a548eccdfd78ad76c826339f56db815bdb8 (diff) |
Use ui_out_emit_tuple
This patch changes various places to use ui_out_emit_tuple,
eliminating a number of cleanups. This patch only tackles "easy"
cases, which are ones where the cleanups in question were
block-structured and did not involve any changes other than the
obvious replacement.
ChangeLog
2017-04-22 Tom Tromey <tom@tromey.com>
* record-btrace.c (record_btrace_insn_history)
(record_btrace_insn_history_range, record_btrace_call_history)
(record_btrace_call_history_range): Use ui_out_emit_tuple.
* thread.c (do_captured_list_thread_ids, print_thread_info_1): Use
ui_out_emit_tuple.
* stack.c (print_frame_info): Use ui_out_emit_tuple.
* solib.c (info_sharedlibrary_command): Use ui_out_emit_tuple.
* skip.c (skip_info): Use ui_out_emit_tuple.
* remote.c (show_remote_cmd): Use ui_out_emit_tuple.
* progspace.c (print_program_space): Use ui_out_emit_tuple.
* probe.c (info_probes_for_ops): Use ui_out_emit_tuple.
* osdata.c (info_osdata): Use ui_out_emit_tuple.
* mi/mi-symbol-cmds.c (mi_cmd_symbol_list_lines): Use
ui_out_emit_tuple.
* mi/mi-main.c (print_one_inferior, list_available_thread_groups)
(output_register, mi_cmd_data_read_memory)
(mi_cmd_data_read_memory_bytes, mi_load_progress)
(mi_cmd_trace_frame_collected): Use ui_out_emit_tuple.
* mi/mi-cmd-var.c (mi_cmd_var_list_children, varobj_update_one):
Use ui_out_emit_tuple.
* mi/mi-cmd-stack.c (mi_cmd_stack_list_args): Use
ui_out_emit_tuple.
* mi/mi-cmd-info.c (mi_cmd_info_ada_exceptions)
(mi_cmd_info_gdb_mi_command): Use ui_out_emit_tuple.
* linux-thread-db.c (info_auto_load_libthread_db): Use
ui_out_emit_tuple.
* inferior.c (print_inferior): Use ui_out_emit_tuple.
* gdb_bfd.c (print_one_bfd): Use ui_out_emit_tuple.
* disasm.c (do_mixed_source_and_assembly_deprecated)
(do_mixed_source_and_assembly): Use ui_out_emit_tuple.
* cp-abi.c (list_cp_abis): Use ui_out_emit_tuple.
* cli/cli-setshow.c (cmd_show_list): Use ui_out_emit_tuple.
* breakpoint.c (print_one_breakpoint_location)
(print_one_breakpoint): Use ui_out_emit_tuple.
* auto-load.c (print_script, info_auto_load_cmd): Use
ui_out_emit_tuple.
* ada-tasks.c (print_ada_task_info): Use ui_out_emit_tuple.
Diffstat (limited to 'gdb/record-btrace.c')
-rw-r--r-- | gdb/record-btrace.c | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c index 61fba1e46f..d4f1bcfe8f 100644 --- a/gdb/record-btrace.c +++ b/gdb/record-btrace.c @@ -725,13 +725,11 @@ record_btrace_insn_history (struct target_ops *self, int size, int flags) struct btrace_thread_info *btinfo; struct btrace_insn_history *history; struct btrace_insn_iterator begin, end; - struct cleanup *uiout_cleanup; struct ui_out *uiout; unsigned int context, covered; uiout = current_uiout; - uiout_cleanup = make_cleanup_ui_out_tuple_begin_end (uiout, - "insn history"); + ui_out_emit_tuple tuple_emitter (uiout, "insn history"); context = abs (size); if (context == 0) error (_("Bad record instruction-history-size.")); @@ -800,7 +798,6 @@ record_btrace_insn_history (struct target_ops *self, int size, int flags) } btrace_set_insn_history (btinfo, &begin, &end); - do_cleanups (uiout_cleanup); } /* The to_insn_history_range method of target record-btrace. */ @@ -812,14 +809,12 @@ record_btrace_insn_history_range (struct target_ops *self, struct btrace_thread_info *btinfo; struct btrace_insn_history *history; struct btrace_insn_iterator begin, end; - struct cleanup *uiout_cleanup; struct ui_out *uiout; unsigned int low, high; int found; uiout = current_uiout; - uiout_cleanup = make_cleanup_ui_out_tuple_begin_end (uiout, - "insn history"); + ui_out_emit_tuple tuple_emitter (uiout, "insn history"); low = from; high = to; @@ -852,8 +847,6 @@ record_btrace_insn_history_range (struct target_ops *self, btrace_insn_history (uiout, btinfo, &begin, &end, flags); btrace_set_insn_history (btinfo, &begin, &end); - - do_cleanups (uiout_cleanup); } /* The to_insn_history_from method of target record-btrace. */ @@ -1085,14 +1078,12 @@ record_btrace_call_history (struct target_ops *self, int size, int int_flags) struct btrace_thread_info *btinfo; struct btrace_call_history *history; struct btrace_call_iterator begin, end; - struct cleanup *uiout_cleanup; struct ui_out *uiout; unsigned int context, covered; record_print_flags flags = (enum record_print_flag) int_flags; uiout = current_uiout; - uiout_cleanup = make_cleanup_ui_out_tuple_begin_end (uiout, - "insn history"); + ui_out_emit_tuple tuple_emitter (uiout, "insn history"); context = abs (size); if (context == 0) error (_("Bad record function-call-history-size.")); @@ -1164,7 +1155,6 @@ record_btrace_call_history (struct target_ops *self, int size, int int_flags) } btrace_set_call_history (btinfo, &begin, &end); - do_cleanups (uiout_cleanup); } /* The to_call_history_range method of target record-btrace. */ @@ -1177,15 +1167,13 @@ record_btrace_call_history_range (struct target_ops *self, struct btrace_thread_info *btinfo; struct btrace_call_history *history; struct btrace_call_iterator begin, end; - struct cleanup *uiout_cleanup; struct ui_out *uiout; unsigned int low, high; int found; record_print_flags flags = (enum record_print_flag) int_flags; uiout = current_uiout; - uiout_cleanup = make_cleanup_ui_out_tuple_begin_end (uiout, - "func history"); + ui_out_emit_tuple tuple_emitter (uiout, "func history"); low = from; high = to; @@ -1218,8 +1206,6 @@ record_btrace_call_history_range (struct target_ops *self, btrace_call_history (uiout, btinfo, &begin, &end, flags); btrace_set_call_history (btinfo, &begin, &end); - - do_cleanups (uiout_cleanup); } /* The to_call_history_from method of target record-btrace. */ |