Fix elf64-ppc.c electric fence warning

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

diff --git a/gdb/common/buffer.c b/gdb/common/buffer.c
index 810173ba4c71fdd5284fd92ffee521b9a1666709..28b2625f069301ccf1994e4918d94a0f1b3f2e00 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-2012 Free Software Foundation, Inc.
+   Copyright (C) 2009-2015 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -17,18 +17,11 @@
    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 <stdlib.h>
-#include <string.h>
-#include <stdio.h>
+#include "inttypes.h"
+#include <stdint.h>
 
 void
 buffer_grow (struct buffer *buffer, const char *data, size_t size)
@@ -139,16 +132,20 @@ buffer_xml_printf (struct buffer *buffer, const char *format, ...)
                  switch (*f)
                    {
                    case 'd':
-                     sprintf (str, "%lld", va_arg (ap, long long));
+                     sprintf (str, "%" PRId64,
+                              (int64_t) va_arg (ap, long long));
                      break;
                    case 'u':
-                     sprintf (str, "%llu", va_arg (ap, unsigned long long));
+                     sprintf (str, "%" PRIu64,
+                              (uint64_t) va_arg (ap, unsigned long long));
                      break;
                    case 'x':
-                     sprintf (str, "%llx", va_arg (ap, unsigned long long));
+                     sprintf (str, "%" PRIx64,
+                              (uint64_t) va_arg (ap, unsigned long long));
                      break;
                    case 'o':
-                     sprintf (str, "%llo", va_arg (ap, unsigned long long));
+                     sprintf (str, "%" PRIo64,
+                              (uint64_t) va_arg (ap, unsigned long long));
                      break;
                    default:
                      str = 0;