From e6a58aa8a70c7fd17d9930e7df8d158a7e3c8c8e Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Thu, 8 Mar 2018 18:04:46 -0500 Subject: Add xml_escape_text_append and use it [This patch should go on top of "linux_qxfer_libraries_svr4: Use std::string", I should have sent them together as a series.] I noticed that linux_qxfer_libraries_svr4 used xml_escape_text, which returns an std::string. That string is then copied into a larger buffer. It would be more efficient if we had a version of xml_escape_text which appended to an existing string instead of returning a new one. This is what this patch does. I manually verified that the output of linux_qxfer_libraries_svr4 didn't change before/after the patch. gdb/ChangeLog: * common/xml-utils.c (xml_escape_text): Move code to... (xml_escape_text_append): ... this new function. * common/xml-utils.h (xml_escape_text_append): New declaration. * unittests/xml-utils-selftests.c (test_xml_escape_text_append): New function. (_initialize_xml_utils): register test_xml_escape_text_append as a selftest. gdb/gdbserver/ChangeLog: * linux-low.c (linux_qxfer_libraries_svr4): Use xml_escape_text_append. --- gdb/unittests/xml-utils-selftests.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'gdb/unittests/xml-utils-selftests.c') diff --git a/gdb/unittests/xml-utils-selftests.c b/gdb/unittests/xml-utils-selftests.c index 2457494..1412773 100644 --- a/gdb/unittests/xml-utils-selftests.c +++ b/gdb/unittests/xml-utils-selftests.c @@ -33,6 +33,18 @@ static void test_xml_escape_text () SELF_CHECK (actual_output == expected_output); } +static void test_xml_escape_text_append () +{ + /* Make sure that we do indeed append. */ + std::string actual_output = "foo"; + const char *input = " &"; + const char *expected_output + = "foo<this isn't="xml"> &"; + xml_escape_text_append (&actual_output, input); + + SELF_CHECK (actual_output == expected_output); +} + } } @@ -41,4 +53,6 @@ _initialize_xml_utils () { selftests::register_test ("xml_escape_text", selftests::xml_utils::test_xml_escape_text); + selftests::register_test ("xml_escape_text_append", + selftests::xml_utils::test_xml_escape_text_append); } -- cgit v1.1