public inbox for gdb-cvs@sourceware.org help / color / mirror / Atom feed
From: Andrew Burgess <aburgess@sourceware.org> To: gdb-cvs@sourceware.org Subject: [binutils-gdb] gdb: make more use of make_target_connection_string Date: Thu, 15 Dec 2022 12:48:12 +0000 (GMT) [thread overview] Message-ID: <20221215124812.A04EF388CF17@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=53cf95c3389a3ecd97276d322e4a60fe3396a201 commit 53cf95c3389a3ecd97276d322e4a60fe3396a201 Author: Andrew Burgess <aburgess@redhat.com> Date: Wed Dec 14 14:17:44 2022 +0000 gdb: make more use of make_target_connection_string I noticed that we have a function make_target_connection_string which wraps all the logic for creating a string that describes a target connection - but in some places we are not calling this function, instead we duplicate the function's logic. This commit cleans this up, and calls make_target_connection_string where possible. There should be no user visible changes after this commit. Diff: --- gdb/inferior.c | 34 ++++++++++------------------------ gdb/target-connection.c | 5 +---- 2 files changed, 11 insertions(+), 28 deletions(-) diff --git a/gdb/inferior.c b/gdb/inferior.c index ec63e0491e5..3d2bce9df7b 100644 --- a/gdb/inferior.c +++ b/gdb/inferior.c @@ -33,6 +33,7 @@ #include "cli/cli-utils.h" #include "arch-utils.h" #include "target-descriptions.h" +#include "target-connection.h" #include "readline/tilde.h" #include "progspace-and-thread.h" #include "gdbsupport/buildargv.h" @@ -482,21 +483,13 @@ static std::string uiout_field_connection (process_stratum_target *proc_target) { if (proc_target == NULL) - { - return {}; - } - else if (proc_target->connection_string () != NULL) - { - return string_printf ("%d (%s %s)", - proc_target->connection_number, - proc_target->shortname (), - proc_target->connection_string ()); - } + return {}; else { - return string_printf ("%d (%s)", - proc_target->connection_number, - proc_target->shortname ()); + std::string conn_str + = make_target_connection_string (proc_target).c_str (); + return string_printf ("%d (%s)", proc_target->connection_number, + conn_str.c_str ()); } } @@ -823,17 +816,10 @@ switch_to_inferior_and_push_target (inferior *new_inf, if (!no_connection && proc_target != NULL) { new_inf->push_target (proc_target); - if (proc_target->connection_string () != NULL) - gdb_printf (_("Added inferior %d on connection %d (%s %s)\n"), - new_inf->num, - proc_target->connection_number, - proc_target->shortname (), - proc_target->connection_string ()); - else - gdb_printf (_("Added inferior %d on connection %d (%s)\n"), - new_inf->num, - proc_target->connection_number, - proc_target->shortname ()); + gdb_printf (_("Added inferior %d on connection %d (%s)\n"), + new_inf->num, + proc_target->connection_number, + make_target_connection_string (proc_target).c_str ()); } else gdb_printf (_("Added inferior %d\n"), new_inf->num); diff --git a/gdb/target-connection.c b/gdb/target-connection.c index d1da6a2d7b9..d88b9c8f563 100644 --- a/gdb/target-connection.c +++ b/gdb/target-connection.c @@ -91,10 +91,7 @@ print_connection (struct ui_out *uiout, const char *requested_connections) process_stratum_target *t = it.second; - size_t l = strlen (t->shortname ()); - if (t->connection_string () != NULL) - l += 1 + strlen (t->connection_string ()); - + size_t l = strlen (make_target_connection_string (t).c_str ()); if (l > what_len) what_len = l; }
reply other threads:[~2022-12-15 12:48 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20221215124812.A04EF388CF17@sourceware.org \ --to=aburgess@sourceware.org \ --cc=gdb-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).