Re: [PUSHED] gdb: make more use of make_target_connection_string

Simon Marchi via Gdb-patches
2022-12-15T12:58:31Z

On 12/15/22 07:53, Andrew Burgess via Gdb-patches wrote:
> Oops! I accidentally pushed this patch to master.
>
> I haven't immediately reverted it because I think it is a pretty
> obvious cleanup, but I would normally have posted this for review.
>
> If anyone has any issues with the patch then please reply, I can
> either fix any problems, or fully revert the patch if requeted.
>
> Sorry for the carelessness.
>
> Thanks,
> Andrew

I just spotted some nits, if you want to fix them up.

> 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 ();

I think you can remove the .c_str here.

> 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 ());

I think you can use std::string::length here.

Simon