From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2073.outbound.protection.outlook.com [40.107.22.73]) by sourceware.org (Postfix) with ESMTPS id 4B9B33858D35 for ; Thu, 25 Nov 2021 14:38:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4B9B33858D35 Received: from DB6P191CA0013.EURP191.PROD.OUTLOOK.COM (2603:10a6:6:28::23) by DU2PR08MB7269.eurprd08.prod.outlook.com (2603:10a6:10:2d4::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.22; Thu, 25 Nov 2021 14:38:27 +0000 Received: from DB5EUR03FT051.eop-EUR03.prod.protection.outlook.com (2603:10a6:6:28:cafe::b5) by DB6P191CA0013.outlook.office365.com (2603:10a6:6:28::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.27 via Frontend Transport; Thu, 25 Nov 2021 14:38:27 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DB5EUR03FT051.mail.protection.outlook.com (10.152.21.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.19 via Frontend Transport; Thu, 25 Nov 2021 14:38:27 +0000 Received: ("Tessian outbound 157533e214a9:v110"); Thu, 25 Nov 2021 14:38:27 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: edacdfc0803dc57e X-CR-MTA-TID: 64aa7808 Received: from 97efb71254ed.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 86717CEC-137E-434E-8AFB-765587986EDD.1; Thu, 25 Nov 2021 14:38:19 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 97efb71254ed.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Thu, 25 Nov 2021 14:38:19 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fspV2oN+ua1Zw9yOvWKgH8E05Ydu/M/I/BRxsVxz/BMIDuvr+CF8yw96LfY0Vsd6P8P5zol88/t/1WFJBfI5eLkm4wd5VoUVhQMlI8C+5DhsMVGt9tvYFTQgdlXGEkQh62VL42Cwtp9uQ9V++u9m3+1MEIbALOm/Te+TVZHaFqOs6CDMDXSJExy44q4d0QJyY+P4o0At/W+KJqbN9BW/U/3KkD+Eu5ovlxcqYxhiFmcx14UlbT74zUMEaGQpuzt3L2iIOc/cjvtr0eu8p5xQlN7/JsiXYa7r5l7szvM81vk0JlaSbB3SMDyTeIZAzToaUmZ2qEAqhnjou25dvAIk9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=KLXdwwfOh70M6oYTywh9wBtzwalZDhM0auzEVK/BuE4=; b=oZJbRg9YfREUuT0V16E18O5mna2Jp4w3k28sLsmgOJ55VQfH2JtBVT/oxwER+MIguQV6iefk7d4yyds5cRKQPWGG88wTbXifcEhBKuLSqWFaNSGfheYBDFeBQCxbVIZA6VX6EyPUm299zGxYp89rvAmcYr4USlVQqkpESlwP7tTeZYqA8UC7ojUMfhHCke6jetlY5PR/PFajWDEGxT1PR66T/a+Sy9so1qrJzlsLcNm8juMoNMxZetXInSzT5Hg5onoeZA1wtvrzTDeRlZt7BgZGoUzo2d+0aUfoNO2ovYEZ6OAEWJAuZ8htzEZU+gqfw+gU0DM4rQvCLu9KGhddDw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none Received: from DB9PR08MB6474.eurprd08.prod.outlook.com (2603:10a6:10:255::17) by DB9PR08MB6395.eurprd08.prod.outlook.com (2603:10a6:10:254::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22; Thu, 25 Nov 2021 14:38:18 +0000 Received: from DB9PR08MB6474.eurprd08.prod.outlook.com ([fe80::7810:89c4:583:781d]) by DB9PR08MB6474.eurprd08.prod.outlook.com ([fe80::7810:89c4:583:781d%8]) with mapi id 15.20.4713.026; Thu, 25 Nov 2021 14:38:18 +0000 From: Vaseeharan Vinayagamoorthy To: "gdb-patches@sourceware.org" , Simon Marchi Subject: Re: [PATCH 2/3] gdb: introduce target_waitkind_str, use it in target_waitstatus::to_string Thread-Topic: [PATCH 2/3] gdb: introduce target_waitkind_str, use it in target_waitstatus::to_string Thread-Index: AQHX374AO1EtnRN77USgl8pjV3vj9qwUUxAu Date: Thu, 25 Nov 2021 14:38:17 +0000 Message-ID: References: <20211122162731.3316783-1-simon.marchi@efficios.com> <20211122162731.3316783-2-simon.marchi@efficios.com> In-Reply-To: <20211122162731.3316783-2-simon.marchi@efficios.com> Accept-Language: en-GB, en-US Content-Language: en-GB X-MS-Has-Attach: X-MS-TNEF-Correlator: suggested_attachment_session_id: aaf67c9e-976b-d5db-ac78-081b9333a165 Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; x-ms-publictraffictype: Email X-MS-Office365-Filtering-Correlation-Id: 0aeb1cdf-feb1-4c54-f85e-08d9b0213e1b x-ms-traffictypediagnostic: DB9PR08MB6395:|DU2PR08MB7269: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true nodisclaimer: true x-ms-oob-tlc-oobclassifiers: OLM:4714;OLM:4714; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: vKbu7ZWKhWTpYMljiFzUBvMEcYv77Vy3DXGWwiJ6E3d6D2rEQHmEIXaeZObwnajKsOtScPS5x4O8NYYNYo5SZMhD4XZnbv/fAAROn3yyZLYnDAzk+59sNlVH0UgEHtbQO9Kz2XtB6VkgO3UpQAxG3E4hQZgimiuxaqXuLK08wbnIOyINJApCUiRs7zwyVFrtZds3ZyEIOlw8Ma58r5HT/nHAqbdLhcnRCRyF5XHyDD3DltNoTXlShqUNrzji32dM3Ky2GTHFyd0H4Uqdo0voJOHlp4MqNRRh0jqo6LN1HPsktI8hIgL5qRB4CpRbsiI4RiTn+Vn2NhBFv4+YLQClkyC/EfKbeHdUuRU2o+B7XzojXda091ljmp3zoVlPyOAzdrRa4VIS08m3oExOKPWeMIHiiVLBqWVjh4ONkNDfQTiTsp5KrUBLywptTegAicsaQ+dtOQZ7p8uTiqTGwCeyx+J4PWAzuSGTlVC0dQcmjnDDdBfp6YrrU+7mYi0h6R/VxNE4xgkug/K5zc9Jz6Gz8crGKZtAYGyHsHGVhWaLvSCns+Z6jzHr9o4Gl9ZdbdBOkLSS5Gc+gj+k6yfyVvKNCfVoO9oOgn9IQxbNlBEVKuLE02H3ZVzxeaLBMGJlNYEcfR9p91997mvsRvIndpgqB4mVBAG0AY4ClwjcRuzu65+drNAHd1yo6/rP87sG/zbPzJTN9GqcCWGiZV2JrRl/PQ== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB9PR08MB6474.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(83380400001)(2906002)(33656002)(7696005)(122000001)(71200400001)(508600001)(38100700002)(52536014)(6506007)(53546011)(55016003)(19627405001)(5660300002)(110136005)(64756008)(66446008)(9686003)(86362001)(8676002)(66556008)(66476007)(76116006)(316002)(186003)(91956017)(66946007)(8936002)(26005)(38070700005); DIR:OUT; SFP:1101; MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB6395 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT051.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: e05fba99-37f3-4dfb-bb17-08d9b02138a8 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zICsFDve06eT3YmPRZ4lp3+8Zd1WaWt4gDE/xg4ozxvReEg0Q8GCLA2bG1TlS7GKpHFg1Etn6toKTA5BFbii+ZLVkgWAYm3zpmQV+IT6qI70Sp7BvLruWk20ptNtNOS+8wIS8jc1Mlq5zi+/jc/SWHTgTvp/sFltFxE6ARvK6lajLDpcWm3qp/hmajpWyx8yLG2FPtLfWmu01z/dEFwOM1sbbjYE2B9KZLF3oY0VWIpb7M4Qsf91B77jziNWKYWnugr9dJt3KXw4VFoR6UnOkgRt/Qu7TiFI23tbSsCOB8/tkIfeDG717yiGk8VFrlup1Uqqrktv1F+mlenBy5C85/nXsmximmOpPckaFEU0gwJtk5gwmTpzPdt9HhVVOho3B/ByAUay4QzKZPjcdrW0mLnyPz0ozXrvAIYQvEPeN/B5t6n/eQhZI7yyUC4U9eKN5kcsb6p4yGxiSLAk3Uk+2keG0uEuvbj3JCspJUK4B6ZzpByQ0f+b08YyybkBBB7bmuRm4RBRECjbZIqxkRf/ZRt1dZR6o4xcu7bJvFwDKvgk0zOaFkClImiim+cI0i91wq3jX00qliMiGC5weqtFMbzrlu/0MtTWyrYhUNQpg4bLnjjgayZMeVt3cefJcodggl0ikbUUoaDCfGEcusj1qJtUjXNUzwFgSPu31q96yHOJMe5IKEX3JWATta6C8kOFI8tnfJel0Bgcja3qpFFXpQ== X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(9686003)(47076005)(508600001)(53546011)(33656002)(26005)(55016003)(110136005)(82310400004)(52536014)(356005)(316002)(6506007)(83380400001)(30864003)(5660300002)(70206006)(19627405001)(36860700001)(8936002)(2906002)(7696005)(70586007)(336012)(8676002)(81166007)(86362001)(186003); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Nov 2021 14:38:27.1975 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0aeb1cdf-feb1-4c54-f85e-08d9b0213e1b X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR03FT051.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR08MB7269 X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FORGED_SPF_HELO, GIT_PATCH_0, HTML_MESSAGE, KAM_DMARC_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, TXREP, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org Content-Type: text/plain; charset="Windows-1252" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Nov 2021 14:38:39 -0000 After this commit, I am seeing this error, when using gcc 4.8.5: gdb/ada-tasks.c:998:10: error: enumeration value =91ADA_TASKS_UNKNOWN=92 no= t handled in switch [-Werror=3Dswitch] switch (data->known_tasks_kind) ^ The build/host/target setup is: Build: x86_64 (Linux), using gcc 4.8.5 Host: x86_64 (Linux) Target: arm-none-eabi / aarch64-none-elf / aarch64_be-none-elf Kind regards Vasee ________________________________ From: Gdb-patches o= n behalf of Simon Marchi via Gdb-patches Sent: 22 November 2021 16:27 To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 2/3] gdb: introduce target_waitkind_str, use it in target_w= aitstatus::to_string I would like to print target_waitkind values in debug messages, so I think that a target_waitkind-to-string function would be useful. While at it, use it in target_waitstatus::to_string. This changes the output of target_waitstatus::to_string a bit, but I think it is for the better. The debug messages will show a string matching exactly the target_waitkind enumerator (minus the TARGET_WAITKIND prefix). As a convenience, make string_appendf return the same reference to string it got as a parameter. This allows doing this: return string_appendf (str, "foo"); ... keeping the code concise. Change-Id: I383dffc9c78614e7d0668b1516073905e798eef7 --- gdb/target/waitstatus.c | 66 +++++++++----------------- gdb/target/waitstatus.h | 49 +++++++++++++++++++ gdb/unittests/common-utils-selftests.c | 7 ++- gdbsupport/common-utils.cc | 8 +++- gdbsupport/common-utils.h | 4 +- 5 files changed, 84 insertions(+), 50 deletions(-) diff --git a/gdb/target/waitstatus.c b/gdb/target/waitstatus.c index 2293d83230d..a7209e3f2b7 100644 --- a/gdb/target/waitstatus.c +++ b/gdb/target/waitstatus.c @@ -20,73 +20,51 @@ #include "gdbsupport/common-defs.h" #include "waitstatus.h" -/* Return a pretty printed form of target_waitstatus. */ +/* See waitstatus.h. */ std::string target_waitstatus::to_string () const { - const char *kind_str =3D "status->kind =3D "; + std::string str =3D string_printf + ("status->kind =3D %s", target_waitkind_str (this->kind ())); +/* Make sure the compiler warns if a new TARGET_WAITKIND enumerator is add= ed + but not handled here. */ +#pragma GCC diagnostic push +#pragma GCC diagnostic error "-Wswitch" switch (this->kind ()) { case TARGET_WAITKIND_EXITED: - return string_printf ("%sexited, status =3D %d", - kind_str, this->exit_status ()); + case TARGET_WAITKIND_THREAD_EXITED: + return string_appendf (str, ", exit_status =3D %d", this->exit_statu= s ()); case TARGET_WAITKIND_STOPPED: - return string_printf ("%sstopped, signal =3D %s", - kind_str, - gdb_signal_to_symbol_string (this->sig ())); - case TARGET_WAITKIND_SIGNALLED: - return string_printf ("%ssignalled, signal =3D %s", - kind_str, - gdb_signal_to_symbol_string (this->sig ())); - - case TARGET_WAITKIND_LOADED: - return string_printf ("%sloaded", kind_str); + return string_appendf (str, ", sig =3D %s", + gdb_signal_to_symbol_string (this->sig ())); case TARGET_WAITKIND_FORKED: - return string_printf ("%sforked, child_ptid =3D %s", kind_str, - this->child_ptid ().to_string ().c_str ()); - case TARGET_WAITKIND_VFORKED: - return string_printf ("%svforked, child_ptid =3D %s", kind_str, - this->child_ptid ().to_string ().c_str ()); + return string_appendf (str, ", child_ptid =3D %s", + this->child_ptid ().to_string ().c_str ()); case TARGET_WAITKIND_EXECD: - return string_printf ("%sexecd, execd_pathname =3D %s", kind_str, - this->execd_pathname ()); + return string_appendf (str, ", execd_pathname =3D %s", + this->execd_pathname ()); + case TARGET_WAITKIND_LOADED: case TARGET_WAITKIND_VFORK_DONE: - return string_printf ("%svfork-done", kind_str); - + case TARGET_WAITKIND_SPURIOUS: case TARGET_WAITKIND_SYSCALL_ENTRY: - return string_printf ("%sentered syscall", kind_str); - case TARGET_WAITKIND_SYSCALL_RETURN: - return string_printf ("%sexited syscall", kind_str); - - case TARGET_WAITKIND_SPURIOUS: - return string_printf ("%sspurious", kind_str); - case TARGET_WAITKIND_IGNORE: - return string_printf ("%signore", kind_str); - case TARGET_WAITKIND_NO_HISTORY: - return string_printf ("%sno-history", kind_str); - case TARGET_WAITKIND_NO_RESUMED: - return string_printf ("%sno-resumed", kind_str); - case TARGET_WAITKIND_THREAD_CREATED: - return string_printf ("%sthread created", kind_str); - - case TARGET_WAITKIND_THREAD_EXITED: - return string_printf ("%sthread exited, status =3D %d", - kind_str, this->exit_status ()); - - default: - return string_printf ("%sunknown???", kind_str); + return str; } +#pragma GCC diagnostic pop + + gdb_assert_not_reached ("invalid target_waitkind value: %d", + (int) this->kind ()); } diff --git a/gdb/target/waitstatus.h b/gdb/target/waitstatus.h index f5b050b8b82..48405d222f4 100644 --- a/gdb/target/waitstatus.h +++ b/gdb/target/waitstatus.h @@ -101,6 +101,55 @@ enum target_waitkind TARGET_WAITKIND_THREAD_EXITED, }; +/* Return KIND as a string. */ + +static inline const char * +target_waitkind_str (target_waitkind kind) +{ +/* Make sure the compiler warns if a new TARGET_WAITKIND enumerator is add= ed + but not handled here. */ +#pragma GCC diagnostic push +#pragma GCC diagnostic error "-Wswitch" + switch (kind) + { + case TARGET_WAITKIND_EXITED: + return "EXITED"; + case TARGET_WAITKIND_STOPPED: + return "STOPPED"; + case TARGET_WAITKIND_SIGNALLED: + return "SIGNALLED"; + case TARGET_WAITKIND_LOADED: + return "LOADED"; + case TARGET_WAITKIND_FORKED: + return "FORKED"; + case TARGET_WAITKIND_VFORKED: + return "VFORKED"; + case TARGET_WAITKIND_EXECD: + return "EXECD"; + case TARGET_WAITKIND_VFORK_DONE: + return "VFORK_DONE"; + case TARGET_WAITKIND_SYSCALL_ENTRY: + return "SYSCALL_ENTRY"; + case TARGET_WAITKIND_SYSCALL_RETURN: + return "SYSCALL_RETURN"; + case TARGET_WAITKIND_SPURIOUS: + return "SPURIOUS"; + case TARGET_WAITKIND_IGNORE: + return "IGNORE"; + case TARGET_WAITKIND_NO_HISTORY: + return "NO_HISTORY"; + case TARGET_WAITKIND_NO_RESUMED: + return "NO_RESUMED"; + case TARGET_WAITKIND_THREAD_CREATED: + return "THREAD_CREATED"; + case TARGET_WAITKIND_THREAD_EXITED: + return "THREAD_EXITED"; + }; +#pragma GCC diagnostic pop + + gdb_assert_not_reached ("invalid target_waitkind value: %d\n", (int) kin= d); +} + struct target_waitstatus { /* Default constructor. */ diff --git a/gdb/unittests/common-utils-selftests.c b/gdb/unittests/common-= utils-selftests.c index 26d313fd329..aa0f45241b9 100644 --- a/gdb/unittests/common-utils-selftests.c +++ b/gdb/unittests/common-utils-selftests.c @@ -80,7 +80,8 @@ string_vprintf_tests () /* Type of both 'string_appendf' and the 'string_vappendf_wrapper' function below. Used to run the same tests against both string_appendf and string_vappendf. */ -typedef void (string_appendf_func) (std::string &str, const char *fmt, ...= ) +typedef std::string &(string_appendf_func) (std::string &str, const char *= fmt, + ...) ATTRIBUTE_PRINTF (2, 3); static void @@ -101,7 +102,7 @@ test_appendf_func (string_appendf_func *func) SELF_CHECK (str =3D=3D "test23foo 45 bar"); } -static void ATTRIBUTE_PRINTF (2, 3) +static std::string & ATTRIBUTE_PRINTF (2, 3) string_vappendf_wrapper (std::string &str, const char *fmt, ...) { va_list vp; @@ -109,6 +110,8 @@ string_vappendf_wrapper (std::string &str, const char *= fmt, ...) va_start (vp, fmt); string_vappendf (str, fmt, vp); va_end (vp); + + return str; } static void diff --git a/gdbsupport/common-utils.cc b/gdbsupport/common-utils.cc index 42bce36e535..b591537e62e 100644 --- a/gdbsupport/common-utils.cc +++ b/gdbsupport/common-utils.cc @@ -119,7 +119,7 @@ string_vprintf (const char* fmt, va_list args) /* See documentation in common-utils.h. */ -void +std::string & string_appendf (std::string &str, const char *fmt, ...) { va_list vp; @@ -127,12 +127,14 @@ string_appendf (std::string &str, const char *fmt, ..= .) va_start (vp, fmt); string_vappendf (str, fmt, vp); va_end (vp); + + return str; } /* See documentation in common-utils.h. */ -void +std::string & string_vappendf (std::string &str, const char *fmt, va_list args) { va_list vp; @@ -148,6 +150,8 @@ string_vappendf (std::string &str, const char *fmt, va_= list args) /* C++11 and later guarantee std::string uses contiguous memory and always includes the terminating '\0'. */ vsprintf (&str[curr_size], fmt, args); /* ARI: vsprintf */ + + return str; } char * diff --git a/gdbsupport/common-utils.h b/gdbsupport/common-utils.h index af078475780..98a9dc72f36 100644 --- a/gdbsupport/common-utils.h +++ b/gdbsupport/common-utils.h @@ -54,11 +54,11 @@ std::string string_vprintf (const char* fmt, va_list ar= gs) /* Like string_printf, but appends to DEST instead of returning a new std::string. */ -void string_appendf (std::string &dest, const char* fmt, ...) +std::string &string_appendf (std::string &dest, const char* fmt, ...) ATTRIBUTE_PRINTF (2, 3); /* Like string_appendf, but takes a va_list. */ -void string_vappendf (std::string &dest, const char* fmt, va_list args) +std::string &string_vappendf (std::string &dest, const char* fmt, va_list = args) ATTRIBUTE_PRINTF (2, 0); /* Make a copy of the string at PTR with LEN characters -- 2.33.1