commit 376a7a033d29d5f2b6e16574a340c999ff2999a0
author Elliott Hughes <enh@google.com> Mon Oct 24 18:35:55 2011 -0700
committer Elliott Hughes <enh@google.com> Mon Oct 24 18:35:55 2011 -0700
tree 9f5207f6185b615219ede2f0125677ca80975052
parent d1cc8363d4f4bbac7568b1d02a5ca481cd10830f

Turn free functions that take a JdwpState* into member functions.

Change-Id: Idf96803c12e160939dbc98be2df41c35a10987da

src/jdwp/jdwp_adb.cc

diff --git a/src/jdwp/jdwp_adb.cc b/src/jdwp/jdwp_adb.cc
index 3a89f34..bd5e6e6 100644
--- a/src/jdwp/jdwp_adb.cc
+++ b/src/jdwp/jdwp_adb.cc
@@ -118,8 +118,8 @@
  * runs in the main thread, before the JDWP thread starts, so it shouldn't
  * do anything that might block forever.
  */
-static bool startup(JdwpState* state, const JdwpStartupParams* pParams) {
-  JdwpNetState*  netState;
+static bool startup(JdwpState* state, const JdwpOptions*) {
+  JdwpNetState* netState;
 
   LOG(VERBOSE) << "ADB transport startup";
 
@@ -445,7 +445,7 @@
     hdr.id = id;
     hdr.cmdSet = cmdSet;
     hdr.cmd = cmd;
-    ProcessRequest(state, &hdr, buf, dataLen, pReply);
+    state->ProcessRequest(&hdr, buf, dataLen, pReply);
     if (expandBufGetLength(pReply) > 0) {
       ssize_t cc = netState->writePacket(pReply);