x86: drop a few dead macros

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

diff --git a/gdb/common/buffer.c b/gdb/common/buffer.c
index a50c890579587aa7ab5e13a008fcb7f6bd915e4b..3c919e7097907de5410cdcbd1912394f3dc602a2 100644 (file)
--- a/gdb/common/buffer.c
+++ b/gdb/common/buffer.c
@@ -1,6 +1,6 @@
 /* A simple growing buffer for GDB.
   
-   Copyright (C) 2009-2014 Free Software Foundation, Inc.
+   Copyright (C) 2009-2019 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -17,20 +17,10 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifdef GDBSERVER
-#include "server.h"
-#else
-#include "defs.h"
-#endif
-
+#include "common-defs.h"
 #include "xml-utils.h"
 #include "buffer.h"
 #include "inttypes.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdint.h>
-
 void
 buffer_grow (struct buffer *buffer, const char *data, size_t size)
 {
@@ -47,7 +37,7 @@ buffer_grow (struct buffer *buffer, const char *data, size_t size)
 
   while (buffer->used_size + size > new_buffer_size)
     new_buffer_size *= 2;
-  new_buffer = xrealloc (buffer->buffer, new_buffer_size);
+  new_buffer = (char *) xrealloc (buffer->buffer, new_buffer_size);
   memcpy (new_buffer + buffer->used_size, data, size);
   buffer->buffer = new_buffer;
   buffer->buffer_size = new_buffer_size;
@@ -98,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;
          
@@ -173,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;