diff options
| author | Simon Marchi <simon.marchi@polymtl.ca> | 2018-03-08 18:04:46 -0500 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@ericsson.com> | 2018-03-08 18:04:46 -0500 |
| commit | e6a58aa8a70c7fd17d9930e7df8d158a7e3c8c8e (patch) | |
| tree | 37f0732614ae940b7fdc392919c260fc8e63bc6f /gdb/gdbserver | |
| parent | f6e8a41e6724e641d3b831983e4d158ff069b8ed (diff) | |
| download | gdb-e6a58aa8a70c7fd17d9930e7df8d158a7e3c8c8e.zip gdb-e6a58aa8a70c7fd17d9930e7df8d158a7e3c8c8e.tar.gz gdb-e6a58aa8a70c7fd17d9930e7df8d158a7e3c8c8e.tar.bz2 | |
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.
Diffstat (limited to 'gdb/gdbserver')
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/gdbserver/linux-low.c | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 33c0484..053cf17 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,5 +1,10 @@ 2018-03-08 Simon Marchi <simon.marchi@polymtl.ca> + * linux-low.c (linux_qxfer_libraries_svr4): Use + xml_escape_text_append. + +2018-03-08 Simon Marchi <simon.marchi@polymtl.ca> + * linux-low.c (linux_qxfer_libraries_svr4): Use std::string. 2018-03-02 Simon Marchi <simon.marchi@polymtl.ca> diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c index c8bb1f5..e649495 100644 --- a/gdb/gdbserver/linux-low.c +++ b/gdb/gdbserver/linux-low.c @@ -7136,12 +7136,12 @@ linux_qxfer_libraries_svr4 (const char *annex, unsigned char *readbuf, header_done = 1; } - std::string name = xml_escape_text ((char *) libname); - string_appendf (document, - "<library name=\"%s\" lm=\"0x%lx\" " + string_appendf (document, "<library name=\""); + xml_escape_text_append (&document, (char *) libname); + string_appendf (document, "\" lm=\"0x%lx\" " "l_addr=\"0x%lx\" l_ld=\"0x%lx\"/>", - name.c_str (), (unsigned long) lm_addr, - (unsigned long) l_addr, (unsigned long) l_ld); + (unsigned long) lm_addr, (unsigned long) l_addr, + (unsigned long) l_ld); } } |