commit 748474146da0c6484fa3dca0a700f612d47550c3
author Elliott Hughes <enh@google.com> Wed Jun 20 18:10:21 2012 -0700
committer Elliott Hughes <enh@google.com> Thu Jun 21 09:14:27 2012 -0700
tree 58837d0fa82d4099eb4b82b2fd3d2bbf4294e4aa
parent 92e3134cd84c134f167175288671a1e6838c908f

Fix a bunch of lint.

There are still about 1800 lint warnings, so don't get too excited...

Change-Id: I2394bd6e750b94060231378b3a7a88b87f70c757

src/jdwp/jdwp_event.cc

diff --git a/src/jdwp/jdwp_event.cc b/src/jdwp/jdwp_event.cc
index a92590d..f398066 100644
--- a/src/jdwp/jdwp_event.cc
+++ b/src/jdwp/jdwp_event.cc
@@ -711,10 +711,10 @@
 
   memset(&basket, 0, sizeof(basket));
   basket.pLoc = pLoc;
-  basket.classId = pLoc->classId;
+  basket.classId = pLoc->class_id;
   basket.thisPtr = thisPtr;
   basket.threadId = Dbg::GetThreadSelfId();
-  basket.className = Dbg::GetClassName(pLoc->classId);
+  basket.className = Dbg::GetClassName(pLoc->class_id);
 
   /*
    * On rare occasions we may need to execute interpreted code in the VM
@@ -766,7 +766,7 @@
     }
     if (match_count != 0) {
       VLOG(jdwp) << "EVENT: " << match_list[0]->eventKind << "(" << match_count << " total) "
-                 << basket.className << "." << Dbg::GetMethodName(pLoc->classId, pLoc->methodId)
+                 << basket.className << "." << Dbg::GetMethodName(pLoc->class_id, pLoc->method_id)
                  << StringPrintf(" thread=%#llx dex_pc=%#llx)", basket.threadId, pLoc->dex_pc);
 
       suspend_policy = scanSuspendPolicy(match_list, match_count);
@@ -904,18 +904,17 @@
  * up the debugger.
  */
 bool JdwpState::PostException(const JdwpLocation* pThrowLoc,
-    ObjectId exceptionId, RefTypeId exceptionClassId,
-    const JdwpLocation* pCatchLoc, ObjectId thisPtr)
-{
+                              ObjectId exceptionId, RefTypeId exceptionClassId,
+                              const JdwpLocation* pCatchLoc, ObjectId thisPtr) {
   ModBasket basket;
 
   memset(&basket, 0, sizeof(basket));
   basket.pLoc = pThrowLoc;
-  basket.classId = pThrowLoc->classId;
+  basket.classId = pThrowLoc->class_id;
   basket.threadId = Dbg::GetThreadSelfId();
   basket.className = Dbg::GetClassName(basket.classId);
   basket.excepClassId = exceptionClassId;
-  basket.caught = (pCatchLoc->classId != 0);
+  basket.caught = (pCatchLoc->class_id != 0);
   basket.thisPtr = thisPtr;
 
   /* don't try to post an exception caused by the debugger */
@@ -938,7 +937,7 @@
                  << StringPrintf(" exceptId=%#llx", exceptionId)
                  << " caught=" << basket.caught << ")"
                  << "  throw: " << *pThrowLoc;
-      if (pCatchLoc->classId == 0) {
+      if (pCatchLoc->class_id == 0) {
         VLOG(jdwp) << "  catch: (not caught)";
       } else {
         VLOG(jdwp) << "  catch: " << *pCatchLoc;