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_event.cc

diff --git a/runtime/jdwp/jdwp_event.cc b/runtime/jdwp/jdwp_event.cc
index 546c637..ef5a7d3 100644
--- a/runtime/jdwp/jdwp_event.cc
+++ b/runtime/jdwp/jdwp_event.cc
@@ -1046,10 +1046,10 @@
    * "Wrap" the contents of the iovec with a JDWP/DDMS header.  We do
    * this by creating a new copy of the vector with space for the header.
    */
-  iovec wrapiov[iov_count+1];  // NOLINT(runtime/arrays) iov_count < 10
+  std::vector<iovec> wrapiov;
+  wrapiov.push_back(iovec());
   for (int i = 0; i < iov_count; i++) {
-    wrapiov[i+1].iov_base = iov[i].iov_base;
-    wrapiov[i+1].iov_len = iov[i].iov_len;
+    wrapiov.push_back(iov[i]);
     dataLen += iov[i].iov_len;
   }
 
@@ -1080,11 +1080,11 @@
   if (safe_to_release_mutator_lock_over_send) {
     // Change state to waiting to allow GC, ... while we're sending.
     self->TransitionFromRunnableToSuspended(kWaitingForDebuggerSend);
-    SendBufferedRequest(type, wrapiov, iov_count + 1);
+    SendBufferedRequest(type, wrapiov);
     self->TransitionFromSuspendedToRunnable();
   } else {
     // Send and possibly block GC...
-    SendBufferedRequest(type, wrapiov, iov_count + 1);
+    SendBufferedRequest(type, wrapiov);
   }
 }