binutils-gdb/gdb/common/xml-utils.c
Simon Marchi e6a58aa8a7 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.
2018-03-08 18:04:46 -05:00

64 lines
1.4 KiB
C

/* Shared helper routines for manipulating XML.
Copyright (C) 2006-2018 Free Software Foundation, Inc.
This file is part of GDB.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "common-defs.h"
#include "xml-utils.h"
/* See xml-utils.h. */
std::string
xml_escape_text (const char *text)
{
std::string result;
xml_escape_text_append (&result, text);
return result;
}
/* See xml-utils.h. */
void
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 += "&apos;";
break;
case '\"':
*result += "&quot;";
break;
case '&':
*result += "&amp;";
break;
case '<':
*result += "&lt;";
break;
case '>':
*result += "&gt;";
break;
default:
*result += text[i];
break;
}
}