Fix ARI warning

[deliverable/binutils-gdb.git] / gdb / ctf.c

diff --git a/gdb/ctf.c b/gdb/ctf.c
index 25a4c79518b6d89e76229bf4b17f6ff448701771..8716cadf97e6bce2512d651d29600319bc386121 100644 (file)
--- a/gdb/ctf.c
+++ b/gdb/ctf.c
@@ -1,6 +1,6 @@
 /* CTF format support.
 
-   Copyright (C) 2012-2016 Free Software Foundation, Inc.
+   Copyright (C) 2012-2017 Free Software Foundation, Inc.
    Contributed by Hui Zhu <hui_zhu@mentor.com>
    Contributed by Yao Qi <yao@codesourcery.com>
 
@@ -29,8 +29,8 @@
 #include "inferior.h"
 #include "gdbthread.h"
 #include "tracefile.h"
-
 #include <ctype.h>
+#include <algorithm>
 
 /* GDB saves trace buffers and other information (such as trace
    status) got from the remote target into Common Trace Format (CTF).
@@ -202,27 +202,6 @@ ctf_save_next_packet (struct trace_write_handler *handler)
 static void
 ctf_save_metadata_header (struct trace_write_handler *handler)
 {
-  const char metadata_fmt[] =
-  "\ntrace {\n"
-  "    major = %u;\n"
-  "    minor = %u;\n"
-  "    byte_order = %s;\n"             /* be or le */
-  "    packet.header := struct {\n"
-  "            uint32_t magic;\n"
-  "    };\n"
-  "};\n"
-  "\n"
-  "stream {\n"
-  "    packet.context := struct {\n"
-  "            uint32_t content_size;\n"
-  "            uint32_t packet_size;\n"
-  "            uint16_t tpnum;\n"
-  "    };\n"
-  "    event.header := struct {\n"
-  "            uint32_t id;\n"
-  "    };\n"
-  "};\n";
-
   ctf_save_write_metadata (handler, "/* CTF %d.%d */\n",
                           CTF_SAVE_MAJOR, CTF_SAVE_MINOR);
   ctf_save_write_metadata (handler,
@@ -262,7 +241,26 @@ ctf_save_metadata_header (struct trace_write_handler *handler)
 #define HOST_ENDIANNESS "le"
 #endif
 
-  ctf_save_write_metadata (handler, metadata_fmt,
+  ctf_save_write_metadata (handler,
+                          "\ntrace {\n"
+                          "    major = %u;\n"
+                          "    minor = %u;\n"
+                          "    byte_order = %s;\n"
+                          "    packet.header := struct {\n"
+                          "            uint32_t magic;\n"
+                          "    };\n"
+                          "};\n"
+                          "\n"
+                          "stream {\n"
+                          "    packet.context := struct {\n"
+                          "            uint32_t content_size;\n"
+                          "            uint32_t packet_size;\n"
+                          "            uint16_t tpnum;\n"
+                          "    };\n"
+                          "    event.header := struct {\n"
+                          "            uint32_t id;\n"
+                          "    };\n"
+                          "};\n",
                           CTF_SAVE_MAJOR, CTF_SAVE_MINOR,
                           HOST_ENDIANNESS);
   ctf_save_write_metadata (handler, "\n");
@@ -306,11 +304,6 @@ ctf_target_save (struct trace_file_writer *self,
   return 0;
 }
 
-#ifdef USE_WIN32API
-#undef mkdir
-#define mkdir(pathname, mode) mkdir (pathname)
-#endif
-
 /* This is the implementation of trace_file_write_ops method
    start.  It creates the directory DIRNAME, metadata and datastream
    in the directory.  */
@@ -1399,7 +1392,7 @@ ctf_xfer_partial (struct target_ops *ops, enum target_object object,
         and this address falls within a read-only section, fallback
         to reading from executable, up to LOW_ADDR_AVAILABLE  */
       if (offset < low_addr_available)
-       len = min (len, low_addr_available - offset);
+       len = std::min (len, low_addr_available - offset);
       res = exec_read_partial_read_only (readbuf, offset, len, xfered_len);
 
       if (res == TARGET_XFER_OK)
@@ -1694,7 +1687,7 @@ ctf_traceframe_info (struct target_ops *self)
          const struct bt_definition *def;
 
          def = bt_ctf_get_field (event, scope, "num");
-         vnum = (int) bt_ctf_get_int64 (def);
+         vnum = (int) bt_ctf_get_uint64 (def);
          VEC_safe_push (int, info->tvars, vnum);
        }
       else