commit f52935278fca8c7aa220543eef4544e3d1105d91
author Brian Carlstrom <bdc@google.com> Fri Jul 19 00:24:00 2013 -0700
committer Brian Carlstrom <bdc@google.com> Fri Jul 19 00:24:00 2013 -0700
tree 16f1882fc07c3a8a7dcd271919bb3a7823ebc520
parent 05eecea70b64095db2bc5f9f8aef7475964a9d7b

Move JDWP to std::vector<iovec> to remove runtime/arrays warning

Change-Id: I8494a25a65de4ebac2b1f4f41c0f5eedf117b7ac

runtime/jdwp/jdwp_main.cc

diff --git a/runtime/jdwp/jdwp_main.cc b/runtime/jdwp/jdwp_main.cc
index 3b6dd81..790bcb5 100644
--- a/runtime/jdwp/jdwp_main.cc
+++ b/runtime/jdwp/jdwp_main.cc
@@ -132,16 +132,16 @@
 /*
  * Write a buffered packet. Grabs a mutex to assure atomicity.
  */
-ssize_t JdwpNetStateBase::WriteBufferedPacket(const iovec* iov, int iov_count) {
+ssize_t JdwpNetStateBase::WriteBufferedPacket(const std::vector<iovec>& iov) {
   MutexLock mu(Thread::Current(), socket_lock_);
-  return TEMP_FAILURE_RETRY(writev(clientSock, iov, iov_count));
+  return TEMP_FAILURE_RETRY(writev(clientSock, &iov[0], iov.size()));
 }
 
 bool JdwpState::IsConnected() {
   return netState != NULL && netState->IsConnected();
 }
 
-void JdwpState::SendBufferedRequest(uint32_t type, const iovec* iov, int iov_count) {
+void JdwpState::SendBufferedRequest(uint32_t type, const std::vector<iovec>& iov) {
   if (netState->clientSock < 0) {
     // Can happen with some DDMS events.
     VLOG(jdwp) << "Not sending JDWP packet: no debugger attached!";
@@ -149,12 +149,12 @@
   }
 
   size_t expected = 0;
-  for (int i = 0; i < iov_count; ++i) {
+  for (size_t i = 0; i < iov.size(); ++i) {
     expected += iov[i].iov_len;
   }
 
   errno = 0;
-  ssize_t actual = netState->WriteBufferedPacket(iov, iov_count);
+  ssize_t actual = netState->WriteBufferedPacket(iov);
   if (static_cast<size_t>(actual) != expected) {
     PLOG(ERROR) << StringPrintf("Failed to send JDWP packet %c%c%c%c to debugger (%d of %d)",
                                 static_cast<uint8_t>(type >> 24),