From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id C5771388CF30 for ; Thu, 15 Dec 2022 12:53:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C5771388CF30 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671108811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AQTNKp8IveYUp568/QOSJwkFN5FzSfwsdfyP8VAH72s=; b=eL6+PdQH8zV+zkoy22/zbLMk9KfCyKUETKmqIC89ggYcm+jolpiOMD3EvNSibLrs4G2GiB 4e8PYb2eaamnloXdU+BDRYlhstkOV3LiGYX0ivZ7b7r7tiYMVVEoXCuYX8wjL4FwGX7iOb Q73tmWGxek895jH6OvBRX21VD+QcQRg= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-227-Oboyp-JGNR-dlN8A-_naEA-1; Thu, 15 Dec 2022 07:53:30 -0500 X-MC-Unique: Oboyp-JGNR-dlN8A-_naEA-1 Received: by mail-wr1-f71.google.com with SMTP id l9-20020adfa389000000b00241f907e102so610472wrb.8 for ; Thu, 15 Dec 2022 04:53:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=AQTNKp8IveYUp568/QOSJwkFN5FzSfwsdfyP8VAH72s=; b=vRfgyGZuCah0qPNOOvXCR++Oiw1WL5jQwPCeG3zHM9QMyRkjFV/tyIaVBNbsiHeyp6 pKNaabLxC02HuiKa2lWyAEpvJvygHyyj0LRGLvnsgNmKvlizJoem27jVMkfm9cd0+4bn BxKBREYTdLflY1jk2oZawuCLfXnp+TB18sgGSk4hwXRWL+rU2QBonzoaK+ZWysx33QmM 0lFA2wP1OxrcvXc1kOod7F2/KqL99Bj1YUak3dmQtkjbbAT6Jg8rPaeupq3T8Hm+lqgX YFaWJXQNopt3X+XVxZq9Z+td1tniQcRBwhCIdMBqJhonw7+Y7MZXQWrrPqFBmqCgsiP9 4fAA== X-Gm-Message-State: ANoB5pn8yN0Xd3o8AKFlTVLIY9IBr2Og03oL4rwSafD9DwaGQyQQNFg1 YfWGRyoQutCmLrVh3VFP5Orr4TZFEmQJqAdzjzEPRvcs8LeOwUSK2bbYU99V8Rh6wJqB5frdbeE m0kbiIpPFR3b2sWJJV3BTuquJPu3VYh+L6LXlbgE+/o8j4fzbgGl+q8U835LPi/I1oH7dDn+j8g == X-Received: by 2002:a5d:6e87:0:b0:242:5057:8b15 with SMTP id k7-20020a5d6e87000000b0024250578b15mr15564915wrz.66.1671108808999; Thu, 15 Dec 2022 04:53:28 -0800 (PST) X-Google-Smtp-Source: AA0mqf7nte2Gf90WpFikbHWa4ewiWsf3qeGisS1Q4t+irSJaQ6gPXp3Np2fkSYB5u4qCMvy9TMCfMw== X-Received: by 2002:a5d:6e87:0:b0:242:5057:8b15 with SMTP id k7-20020a5d6e87000000b0024250578b15mr15564902wrz.66.1671108808731; Thu, 15 Dec 2022 04:53:28 -0800 (PST) Received: from localhost ([31.111.84.238]) by smtp.gmail.com with ESMTPSA id k3-20020a5d5183000000b002422bc69111sm7044350wrv.9.2022.12.15.04.53.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 04:53:28 -0800 (PST) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PUSHED] gdb: make more use of make_target_connection_string Date: Thu, 15 Dec 2022 12:53:26 +0000 Message-Id: <53cf95c3389a3ecd97276d322e4a60fe3396a201.1671108652.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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 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. --- 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; } base-commit: c91a13e4e6790324e2177fa4b98e4637e3b03f97 -- 2.25.4