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.

2 files changed, 11 insertions, 28 deletions

diff --git a/gdb/inferior.c b/gdb/inferior.c
index ec63e04..3d2bce9 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 d1da6a2..d88b9c8 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;
     }