- Fix string formatting.

runtime/bin/vmstats_impl.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "bin/vmstats_impl.h"
 
 #include <sstream>
 
 #include "bin/fdutils.h"
 #include "bin/file.h"
@@ skipping 41 matching lines @@
     return;
   }
 
   const intptr_t BACKLOG = 128;  // Default value from HttpServer.dart
   int64_t address = ServerSocket::CreateBindListen(host_ip, port, BACKLOG);
   if (address < 0) {
     Log::PrintErr("Failed binding VmStats socket: %s:%d\n", host, port);
     return;
   }
   instance_->bind_address_ = address;
-  Log::Print(
-#if defined(TARGET_ARCH_X64)
-      "VmStats URL: http://%s:%ld/\n",
-#else
-      "VmStats URL: http://%s:%d/\n",
-#endif
-      host,
-             Socket::GetPort(address));
+  Log::Print("VmStats URL: http://%s:%"Pd"/\n", host, Socket::GetPort(address));
 
   instance_->running_ = true;
-  int errno = dart::Thread::Start(WebServer, address);
-  if (errno != 0) {
-    Log::PrintErr("Failed starting VmStats thread: %d\n", errno);
+  int err = dart::Thread::Start(WebServer, address);
+  if (err != 0) {
+    Log::PrintErr("Failed starting VmStats thread: %d\n", err);
     Shutdown();
   }
 }
 
 
 void VmStats::Stop() {
   MonitorLocker ml(&instance_monitor_);
   if (instance_ != NULL) {
     instance_->running_ = false;
   }
@@ skipping 118 matching lines @@
     if (strcmp(url, "/isolates") == 0) {
       content = instance_->IsolatesStatus();
     } else {
       // Check plug-ins.
       content = VmStatusService::GetVmStatus(url);
     }
 
     if (content != NULL) {
       size_t content_len = strlen(content);
       len = snprintf(buffer, BUFSIZE,
-#if defined(TARGET_ARCH_X64)
           "HTTP/1.1 200 OK\nContent-Type: application/json; charset=UTF-8\n"
-          "Content-Length: %lx\n\n",
-#else
-          "HTTP/1.1 200 OK\nContent-Type: application/json; charset=UTF-8\n"
-          "Content-Length: %d\n\n",
-#endif
+          "Content-Length: %"Pu"\n\n",
           content_len);
       Socket::Write(socket, buffer, strlen(buffer));
       Socket::Write(socket, content, content_len);
       Socket::Write(socket, "\n", 1);
       Socket::Write(socket, buffer, strlen(buffer));
       free(content);
     } else {
       // No status content with this URL, return file or resource content.
       std::string path(instance_->root_directory_);
       path.append(url);
 
       // Expand directory URLs.
       if (strcmp(url, "/") == 0) {
         path.append(VMSTATS_HTML);
       } else if (url[strlen(url) - 1] == '/') {
         path.append(INDEX_HTML);
       }
 
       bool success = false;
       if (File::Exists(path.c_str())) {
         File* f = File::Open(path.c_str(), File::kRead);
         if (f != NULL) {
           intptr_t len = f->Length();
           char* text_buffer = reinterpret_cast<char*>(malloc(len));
           if (f->ReadFully(text_buffer, len)) {
             const char* content_type = ContentType(path.c_str());
             snprintf(buffer, BUFSIZE,
-#if defined(TARGET_ARCH_X64)
                 "HTTP/1.1 200 OK\nContent-Type: %s\n"
-                "Content-Length: %ld\n\n",
-#else
-                "HTTP/1.1 200 OK\nContent-Type: %s\n"
-                "Content-Length: %d\n\n",
-#endif
+                "Content-Length: %"Pu"\n\n",
                 content_type, len);
             Socket::Write(socket, buffer, strlen(buffer));
             Socket::Write(socket, text_buffer, len);
             Socket::Write(socket, "\n", 1);
             success = true;
           }
           free(text_buffer);
           delete f;
         }
       } else {
@@ skipping 14 matching lines @@
 char* VmStats::IsolatesStatus() {
   std::ostringstream stream;
   stream << '{' << std::endl;
   stream << "\"isolates\": [" << std::endl;
   IsolateTable::iterator itr;
   bool first = true;
   for (itr = isolate_table_.begin(); itr != isolate_table_.end(); ++itr) {
     Dart_Isolate isolate = itr->second;
     static char request[512];
     snprintf(request, sizeof(request),
-#if defined(TARGET_ARCH_X64)
-             "/isolate/0x%lx",
-#else
-             "/isolate/0x%llx",
-#endif
-             reinterpret_cast<int64_t>(isolate));
+             "/isolate/0x%"Px,
+             reinterpret_cast<intptr_t>(isolate));
     char* status = VmStatusService::GetVmStatus(request);
     if (status != NULL) {
       stream << status;
       if (!first) {
         stream << "," << std::endl;
       }
       first = false;
     }
     free(status);
   }
@@ skipping 40 matching lines @@
   VmStatusPlugin* plugin = instance_->registered_plugin_list_;
   while (plugin != NULL) {
     char* result = (plugin->callback())(request);
     if (result != NULL) {
       return result;
     }
     plugin = plugin->next();
   }
   return NULL;
 }