From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id 047E93854085 for ; Fri, 16 Dec 2022 02:56:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 047E93854085 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=polymtl.ca Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=polymtl.ca Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 2BG2un9M029400 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Dec 2022 21:56:54 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 2BG2un9M029400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1671159414; bh=FObww3x4STEkECjKTiL8otkaHmklu9KsZgB9tAmassg=; h=From:To:Cc:Subject:Date:From; b=DlFPyWOAQwK10KUAWB48KOjOBXCIzXYvXMvQZN8nm2Y/JuffRllYsEjw5PeOPvOa8 TPrNmSs7dqUVQmFN0++9il3tUtFxxsU7UMePf0AFvK4mWdYk/1GsUEmTG2lU4yBy6H hSE50gBBoxINCinmuhuS7zF0qjea3O4kDfprRYh0= Received: from simark.localdomain (unknown [217.28.27.60]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 45ED91E0CD; Thu, 15 Dec 2022 21:56:49 -0500 (EST) From: Simon Marchi To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [pushed] gdbsupport: change xml_escape_text_append's parameter from pointer to reference Date: Thu, 15 Dec 2022 21:56:48 -0500 Message-Id: <20221216025648.1186579-1-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Fri, 16 Dec 2022 02:56:49 +0000 X-Spam-Status: No, score=-3189.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS,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: The passed in string can't be nullptr, it makes more sense to pass in a reference. Change-Id: Idc8bd38abe1d6d9b44aa227d7856956848c233b3 --- gdb/unittests/xml-utils-selftests.c | 2 +- gdbserver/linux-low.cc | 2 +- gdbserver/netbsd-low.cc | 2 +- gdbsupport/xml-utils.cc | 16 ++++++++-------- gdbsupport/xml-utils.h | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gdb/unittests/xml-utils-selftests.c b/gdb/unittests/xml-utils-selftests.c index 08a48f686aa9..f86e1e1bc077 100644 --- a/gdb/unittests/xml-utils-selftests.c +++ b/gdb/unittests/xml-utils-selftests.c @@ -40,7 +40,7 @@ static void test_xml_escape_text_append () const char *input = " &"; const char *expected_output = "foo<this isn't="xml"> &"; - xml_escape_text_append (&actual_output, input); + xml_escape_text_append (actual_output, input); SELF_CHECK (actual_output == expected_output); } diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index 6f96e16d6f04..5e412315e6dd 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -6520,7 +6520,7 @@ read_link_map (std::string &document, CORE_ADDR lmid, CORE_ADDR lm_addr, if (libname[0] != '\0') { string_appendf (document, "", paddress (lm_addr), paddress (l_addr), diff --git a/gdbserver/netbsd-low.cc b/gdbserver/netbsd-low.cc index f05bcd4e173f..af2c6c82b908 100644 --- a/gdbserver/netbsd-low.cc +++ b/gdbserver/netbsd-low.cc @@ -1086,7 +1086,7 @@ netbsd_qxfer_libraries_svr4 (const pid_t pid, const char *annex, } string_appendf (document, "", (unsigned long) lm_addr, (unsigned long) l_addr, diff --git a/gdbsupport/xml-utils.cc b/gdbsupport/xml-utils.cc index ec5e943828b7..e47e23ced590 100644 --- a/gdbsupport/xml-utils.cc +++ b/gdbsupport/xml-utils.cc @@ -27,7 +27,7 @@ xml_escape_text (const char *text) { std::string result; - xml_escape_text_append (&result, text); + xml_escape_text_append (result, text); return result; } @@ -35,29 +35,29 @@ xml_escape_text (const char *text) /* See xml-utils.h. */ void -xml_escape_text_append (std::string *result, const char *text) +xml_escape_text_append (std::string &result, const char *text) { /* Expand the result. */ for (int i = 0; text[i] != '\0'; i++) switch (text[i]) { case '\'': - *result += "'"; + result += "'"; break; case '\"': - *result += """; + result += """; break; case '&': - *result += "&"; + result += "&"; break; case '<': - *result += "<"; + result += "<"; break; case '>': - *result += ">"; + result += ">"; break; default: - *result += text[i]; + result += text[i]; break; } } diff --git a/gdbsupport/xml-utils.h b/gdbsupport/xml-utils.h index 4df2f8ab6f62..695263c5b379 100644 --- a/gdbsupport/xml-utils.h +++ b/gdbsupport/xml-utils.h @@ -28,6 +28,6 @@ extern std::string xml_escape_text (const char *text); /* Append TEXT to RESULT, with special characters replaced by entity references. */ -extern void xml_escape_text_append (std::string *result, const char *text); +extern void xml_escape_text_append (std::string &result, const char *text); #endif /* COMMON_XML_UTILS_H */ base-commit: f8631e5e04dbef678323e9be6b7329f39049d2c4 -- 2.38.1