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/remote.c | |
| parent | a8cc8a548eccdfd78ad76c826339f56db815bdb8 (diff) | |
| download | gdb-2e78302469502f4f8a98144b60c09d4d9b6438fd.zip gdb-2e78302469502f4f8a98144b60c09d4d9b6438fd.tar.gz gdb-2e78302469502f4f8a98144b60c09d4d9b6438fd.tar.bz2 | |
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/remote.c')
| -rw-r--r-- | gdb/remote.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/gdb/remote.c b/gdb/remote.c index 694897d..2cd9850 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -13799,11 +13799,10 @@ show_remote_cmd (char *args, int from_tty) { /* We can't just use cmd_show_list here, because we want to skip the redundant "show remote Z-packet" and the legacy aliases. */ - struct cleanup *showlist_chain; struct cmd_list_element *list = remote_show_cmdlist; struct ui_out *uiout = current_uiout; - showlist_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "showlist"); + ui_out_emit_tuple tuple_emitter (uiout, "showlist"); for (; list != NULL; list = list->next) if (strcmp (list->name, "Z-packet") == 0) continue; @@ -13813,8 +13812,7 @@ show_remote_cmd (char *args, int from_tty) continue; else { - struct cleanup *option_chain - = make_cleanup_ui_out_tuple_begin_end (uiout, "option"); + ui_out_emit_tuple option_emitter (uiout, "option"); uiout->field_string ("name", list->name); uiout->text (": "); @@ -13822,12 +13820,7 @@ show_remote_cmd (char *args, int from_tty) do_show_command (NULL, from_tty, list); else cmd_func (list, NULL, from_tty); - /* Close the tuple. */ - do_cleanups (option_chain); } - - /* Close the tuple. */ - do_cleanups (showlist_chain); } |