Another round of cleanups for http://www.dartbug.com/15922

runtime/bin/dbg_message.cc

 // Copyright (c) 2012, 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/dbg_connection.h"
 #include "bin/dbg_message.h"
 #include "bin/dartutils.h"
 #include "bin/thread.h"
 #include "bin/utils.h"
 
@@ skipping 73 matching lines @@
 
 static const char* GetStringChars(Dart_Handle str) {
   ASSERT(Dart_IsString(str));
   const char* chars;
   Dart_Handle res = Dart_StringToCString(str, &chars);
   ASSERT(!Dart_IsError(res));
   return chars;
 }
 
 
-static int GetIntValue(Dart_Handle int_handle) {
+static int64_t GetIntValue(Dart_Handle int_handle) {
   int64_t int64_val = -1;
   ASSERT(Dart_IsInteger(int_handle));
   Dart_Handle res = Dart_IntegerToInt64(int_handle, &int64_val);
   ASSERT_NOT_ERROR(res);
-  // TODO(hausner): Range check.
   return int64_val;
 }
 
 
 char* MessageParser::GetStringParam(const char* name) const {
   const char* params = Params();
   ASSERT(params != NULL);
   dart::JSONReader pr(params);
   pr.Seek(name);
   if (pr.Type() != dart::JSONReader::kString) {
@@ skipping 250 matching lines @@
               is_debuggable ? "\"true\"" : "\"false\"");
 
   // Imports and prefixes.
   Dart_Handle import_list = Dart_GetLibraryImports(lib_id);
   RETURN_IF_ERROR(import_list);
   ASSERT(Dart_IsList(import_list));
   intptr_t list_length = 0;
   res = Dart_ListLength(import_list, &list_length);
   RETURN_IF_ERROR(res);
   buf->Printf(",\"imports\":[");
-  for (int i = 0; i + 1 < list_length; i += 2) {
+  for (intptr_t i = 0; i + 1 < list_length; i += 2) {
     Dart_Handle lib_id = Dart_ListGetAt(import_list, i + 1);
     ASSERT_NOT_ERROR(lib_id);
-    buf->Printf("%s{\"libraryId\":%d,",
+    buf->Printf("%s{\"libraryId\":%" Pd64 ",",
                 (i > 0) ? ",": "",
                 GetIntValue(lib_id));
 
     Dart_Handle name = Dart_ListGetAt(import_list, i);
     ASSERT_NOT_ERROR(name);
     buf->Printf("\"prefix\":\"%s\"}",
                 Dart_IsNull(name) ? "" : GetStringChars(name));
   }
   buf->Printf("],");
 
@@ skipping 189 matching lines @@
   ASSERT(in_msg != NULL);
   MessageParser msg_parser(in_msg->buffer(), in_msg->buffer_len());
   int msg_id = msg_parser.MessageId();
   dart::TextBuffer msg(64);
   msg.Printf("{ \"id\": %d, \"result\": { \"libraries\": [", msg_id);
   Dart_Handle lib_ids = Dart_GetLibraryIds();
   ASSERT_NOT_ERROR(lib_ids);
   intptr_t num_libs;
   Dart_Handle res = Dart_ListLength(lib_ids, &num_libs);
   ASSERT_NOT_ERROR(res);
-  for (int i = 0; i < num_libs; i++) {
+  for (intptr_t i = 0; i < num_libs; i++) {
     Dart_Handle lib_id_handle = Dart_ListGetAt(lib_ids, i);
     ASSERT(Dart_IsInteger(lib_id_handle));
-    int lib_id = GetIntValue(lib_id_handle);
-    Dart_Handle lib_url = Dart_GetLibraryURL(lib_id);
+    int64_t lib_id = GetIntValue(lib_id_handle);
+    ASSERT((lib_id >= kIntptrMin) && (lib_id <= kIntptrMax));
+    Dart_Handle lib_url = Dart_GetLibraryURL(static_cast<intptr_t>(lib_id));
     ASSERT_NOT_ERROR(lib_url);
     ASSERT(Dart_IsString(lib_url));
-    msg.Printf("%s{\"id\":%d,\"url\":", (i == 0) ? "" : ", ", lib_id);
+    msg.Printf("%s{\"id\":%" Pd64 ",\"url\":", (i == 0) ? "" : ", ", lib_id);
     FormatEncodedString(&msg, lib_url);
     msg.Printf("}");
   }
   msg.Printf("]}}");
   in_msg->SendReply(&msg);
   return false;
 }
 
 
 bool DbgMessage::HandleGetClassPropsCmd(DbgMessage* in_msg) {
@@ skipping 290 matching lines @@
   msg.Printf("\"result\": { \"lines\": [");
   Dart_Handle elem;
   intptr_t num_elems = 0;
   for (intptr_t i = 0; i < info_len; i++) {
     elem = Dart_ListGetAt(info, i);
     if (Dart_IsNull(elem)) {
       msg.Printf((i == 0) ? "[" : "], [");
       num_elems = 0;
     } else {
       ASSERT(Dart_IsInteger(elem));
-      int value = GetIntValue(elem);
+      int64_t value = GetIntValue(elem);
       if (num_elems == 0) {
-        msg.Printf("%d", value);
+        msg.Printf("%" Pd64 "", value);
       } else {
-        msg.Printf(",%d", value);
+        msg.Printf(",%" Pd64 "", value);
       }
       num_elems++;
     }
   }
   msg.Printf("]]}}");
   in_msg->SendReply(&msg);
   return false;
 }
 
 
@@ skipping 453 matching lines @@
     } else {
       ASSERT(kind == kShutdown);
       RemoveIsolateMsgQueue(isolate_id);
     }
   }
   Dart_ExitScope();
 }
 
 }  // namespace bin
 }  // namespace dart