From 8dd8c8d4ab262bc4e469b9914cc9b83de3b5bcfb Mon Sep 17 00:00:00 2001 From: Marco Barisione Date: Wed, 19 May 2021 13:58:41 +0100 Subject: gdb: Pass std::strings to ui_out::field_string () where convenient While adding a ui_out::text () overload accepting a std::string, I noticed that several callers of ui_out::field_string () were converting std::string instances to char pointers even if not necessary. gdb/ChangeLog: * ui-out.c (ui_out::field_string): Add missing style_argument to the overload accepting a std::string, to make it equivalent to the char pointer version. * ui-out.h (class ui_out): Ditto. * break-catch-sig.c (signal_catchpoint_print_one): Do not convert std::strings to char pointers before passing them to ui_out::field_string (). * break-catch-throw.c (print_one_detail_exception_catchpoint): Ditto. * cli/cli-setshow.c (do_show_command): Ditto. * disasm.c (gdb_pretty_print_disassembler::pretty_print_insn): Ditto. * infcmd.c (print_return_value_1): Ditto. * inferior.c (print_inferior): Ditto. * linux-thread-db.c (info_auto_load_libthread_db): Ditto. * mi/mi-cmd-var.c (print_varobj): Ditto. (mi_cmd_var_set_format): Ditto. (mi_cmd_var_info_type): Ditto. (mi_cmd_var_info_expression): Ditto. (mi_cmd_var_evaluate_expression): Ditto. (mi_cmd_var_assign): Ditto. (varobj_update_one): Ditto. * mi/mi-main.c (list_available_thread_groups): Ditto. (mi_cmd_data_read_memory_bytes): Ditto. (mi_cmd_trace_frame_collected): Ditto. * osdata.c (info_osdata): Ditto. * probe.c (info_probes_for_spops): Ditto. * target-connection.c (print_connection): Ditto. * thread.c (print_thread_info_1): Ditto. * tracepoint.c (print_one_static_tracepoint_marker): Ditto. --- gdb/inferior.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gdb/inferior.c') diff --git a/gdb/inferior.c b/gdb/inferior.c index a8779c354b5..059839ec962 100644 --- a/gdb/inferior.c +++ b/gdb/inferior.c @@ -529,7 +529,7 @@ print_inferior (struct ui_out *uiout, const char *requested_inferiors) uiout->field_string ("target-id", inferior_pid_to_str (inf->pid)); std::string conn = uiout_field_connection (inf->process_target ()); - uiout->field_string ("connection-id", conn.c_str ()); + uiout->field_string ("connection-id", conn); if (inf->pspace->exec_filename != nullptr) uiout->field_string ("exec", inf->pspace->exec_filename.get ()); -- cgit v1.2.1