From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1879) id CBE6038533E8; Fri, 16 Dec 2022 02:56:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CBE6038533E8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1671159399; bh=WO5I9QgRH6OQZe5ym0H+lui+GC/+iJ2tLpamfaZYdkc=; h=From:To:Subject:Date:From; b=y7RCEOL5b2LPK8d8KHXeBHd8ucMXW2wcImiBEvNNz7pwxgxRpahEDM+Hbe2QfRnSK ouOSSMNshwWs2zQB0W2clrGhtJUJkuzaaVT8bVRT0GX+f68TOKDjLdOCTB2xmiDWRE f6jkFuinQJyrqnoFjp0K7PlFl7yNJdCJ5ku6k1is= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Simon Marchi To: gdb-cvs@sourceware.org Subject: [binutils-gdb] gdbsupport: change xml_escape_text_append's parameter from pointer to reference X-Act-Checkin: binutils-gdb X-Git-Author: Simon Marchi X-Git-Refname: refs/heads/master X-Git-Oldrev: f8631e5e04dbef678323e9be6b7329f39049d2c4 X-Git-Newrev: de75275fe54c5536c8238f0f3f88bb7ac2222942 Message-Id: <20221216025639.CBE6038533E8@sourceware.org> Date: Fri, 16 Dec 2022 02:56:39 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Dde75275fe54c= 5536c8238f0f3f88bb7ac2222942 commit de75275fe54c5536c8238f0f3f88bb7ac2222942 Author: Simon Marchi Date: Wed Oct 19 22:00:59 2022 -0400 gdbsupport: change xml_escape_text_append's parameter from pointer to r= eference =20 The passed in string can't be nullptr, it makes more sense to pass in a reference. =20 Change-Id: Idc8bd38abe1d6d9b44aa227d7856956848c233b3 Diff: --- 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 08a48f686aa..f86e1e1bc07 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 =3D " &"; const char *expected_output =3D "foo<this isn't=3D"xml"> &"; - xml_escape_text_append (&actual_output, input); + xml_escape_text_append (actual_output, input); =20 SELF_CHECK (actual_output =3D=3D expected_output); } diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index 6f96e16d6f0..5e412315e6d 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] !=3D '\0') { string_appendf (document, "", paddress (lm_addr), paddress (l_addr), diff --git a/gdbserver/netbsd-low.cc b/gdbserver/netbsd-low.cc index f05bcd4e173..af2c6c82b90 100644 --- a/gdbserver/netbsd-low.cc +++ b/gdbserver/netbsd-low.cc @@ -1086,7 +1086,7 @@ netbsd_qxfer_libraries_svr4 (const pid_t pid, const c= har *annex, } =20 string_appendf (document, "", (unsigned long) lm_addr, (unsigned long) l_addr, diff --git a/gdbsupport/xml-utils.cc b/gdbsupport/xml-utils.cc index ec5e943828b..e47e23ced59 100644 --- a/gdbsupport/xml-utils.cc +++ b/gdbsupport/xml-utils.cc @@ -27,7 +27,7 @@ xml_escape_text (const char *text) { std::string result; =20 - xml_escape_text_append (&result, text); + xml_escape_text_append (result, text); =20 return result; } @@ -35,29 +35,29 @@ xml_escape_text (const char *text) /* See xml-utils.h. */ =20 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 =3D 0; text[i] !=3D '\0'; i++) switch (text[i]) { case '\'': - *result +=3D "'"; + result +=3D "'"; break; case '\"': - *result +=3D """; + result +=3D """; break; case '&': - *result +=3D "&"; + result +=3D "&"; break; case '<': - *result +=3D "<"; + result +=3D "<"; break; case '>': - *result +=3D ">"; + result +=3D ">"; break; default: - *result +=3D text[i]; + result +=3D text[i]; break; } } diff --git a/gdbsupport/xml-utils.h b/gdbsupport/xml-utils.h index 4df2f8ab6f6..695263c5b37 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. */ =20 -extern void xml_escape_text_append (std::string *result, const char *text); +extern void xml_escape_text_append (std::string &result, const char *text); =20 #endif /* COMMON_XML_UTILS_H */