commit d77fd720a406335f896374b8c64174cd8756aad6
author Brian Carlstrom <bdc@google.com> Wed Jan 18 23:11:06 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 18 23:11:06 2012 -0800
tree a6b51ed9ea6b42ffc9cc1ab9e67728e1eb56926a
parent abd04b94b3404ba0610094314ea50bfc0ed2a0ef
parent 07bb855daaad20f2d300418cee5a2d977758a3a1

Merge "Use lower_bound to search multimap" into dalvik-dev

src/jdwp/jdwp_handler.cc

diff --git a/src/jdwp/jdwp_handler.cc b/src/jdwp/jdwp_handler.cc
index e7730e5..aabdcb8 100644
--- a/src/jdwp/jdwp_handler.cc
+++ b/src/jdwp/jdwp_handler.cc
@@ -122,7 +122,7 @@
     size_t width = Dbg::GetTagWidth(typeTag);
     uint64_t value = jdwpReadValue(&buf, width);
 
-    VLOG(jdwp) << StringPrintf("          '%c'(%d): 0x%llx", typeTag, width, value);
+    VLOG(jdwp) << StringPrintf("          '%c'(%zd): 0x%llx", typeTag, width, value);
     argArray[i] = value;
   }
 
@@ -806,7 +806,7 @@
     size_t width = Dbg::GetTagWidth(fieldTag);
     uint64_t value = jdwpReadValue(&buf, width);
 
-    VLOG(jdwp) << StringPrintf("    --> fieldId=%x tag='%c'(%d) value=%lld", fieldId, fieldTag, width, value);
+    VLOG(jdwp) << StringPrintf("    --> fieldId=%x tag='%c'(%zd) value=%lld", fieldId, fieldTag, width, value);
 
     Dbg::SetFieldValue(objectId, fieldId, value, width);
   }
@@ -985,7 +985,7 @@
 
   size_t frameCount = Dbg::GetThreadFrameCount(threadId);
 
-  VLOG(jdwp) << StringPrintf("  Request for frames: threadId=%llx start=%d length=%d [count=%d]", threadId, startFrame, length, frameCount);
+  VLOG(jdwp) << StringPrintf("  Request for frames: threadId=%llx start=%d length=%d [count=%zd]", threadId, startFrame, length, frameCount);
   if (frameCount <= 0) {
     return ERR_THREAD_NOT_SUSPENDED;    /* == 0 means 100% native */
   }