diff options
| author | Simon Marchi <simon.marchi@ericsson.com> | 2017-09-16 14:19:31 +0200 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@ericsson.com> | 2017-09-16 14:19:31 +0200 |
| commit | 5e1875543df7413d3cbc3831390445e347064b75 (patch) | |
| tree | 215e09584279387448ae183671588f0bac07a1f6 /gdb/common/buffer.c | |
| parent | c3d7b541fa920e6ecb0f06ffe1e0e3f070fa295d (diff) | |
| download | gdb-5e1875543df7413d3cbc3831390445e347064b75.zip gdb-5e1875543df7413d3cbc3831390445e347064b75.tar.gz gdb-5e1875543df7413d3cbc3831390445e347064b75.tar.bz2 | |
Make xml_escape_text return an std::string
This is a simple replacement, it allows removing some manual free'ing in
the callers.
gdb/ChangeLog:
* common/buffer.c (buffer_xml_printf): Adjust.
* common/xml-utils.c (xml_escape_text): Change return type to
std::string, update code accordingly.
* common/xml-utils.h (xml_escape_text): Change return type to
std::string.
* rs6000-aix-tdep.c (rs6000_aix_shared_library_to_xml): Adjust.
* windows-tdep.c (windows_xfer_shared_library): Adjust.
* unittests/xml-utils-selftests.c (test_xml_escape_text):
Adjust.
gdb/gdbserver/ChangeLog:
* linux-low.c (linux_qxfer_libraries_svr4): Adjust to change of
return type of xml_escape_text.
* server.c (emit_dll_description): Likewise.
Diffstat (limited to 'gdb/common/buffer.c')
| -rw-r--r-- | gdb/common/buffer.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gdb/common/buffer.c b/gdb/common/buffer.c index c5eb169..70d91e6 100644 --- a/gdb/common/buffer.c +++ b/gdb/common/buffer.c @@ -88,7 +88,6 @@ buffer_xml_printf (struct buffer *buffer, const char *format, ...) if (percent) { char buf[32]; - char *p; char *str = buf; const char *f_old = f; @@ -163,9 +162,8 @@ buffer_xml_printf (struct buffer *buffer, const char *format, ...) if (str) { buffer_grow (buffer, prev, f_old - prev - 1); - p = xml_escape_text (str); - buffer_grow_str (buffer, p); - xfree (p); + std::string p = xml_escape_text (str); + buffer_grow_str (buffer, p.c_str ()); prev = f + 1; } percent = 0; |