Make xml_escape_text return an std::string

[deliverable/binutils-gdb.git] / gdb / common / buffer.c

diff --git a/gdb/common/buffer.c b/gdb/common/buffer.c
index c5eb16904fb19cc5de5c3d6e9e6bdb7eab067322..70d91e6182c3d8a63d5e155843ee57fb1e81e5b3 100644 (file)
--- 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;