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/debugger.cc

diff --git a/src/debugger.cc b/src/debugger.cc
index 29cb965..1dbcccc 100644
--- a/src/debugger.cc
+++ b/src/debugger.cc
@@ -952,9 +952,9 @@
     memset(&location, 0, sizeof(location));
   } else {
     Class* c = m->GetDeclaringClass();
-    location.typeTag = c->IsInterface() ? JDWP::TT_INTERFACE : JDWP::TT_CLASS;
-    location.classId = gRegistry->Add(c);
-    location.methodId = ToMethodId(m);
+    location.type_tag = c->IsInterface() ? JDWP::TT_INTERFACE : JDWP::TT_CLASS;
+    location.class_id = gRegistry->Add(c);
+    location.method_id = ToMethodId(m);
     location.dex_pc = m->IsNative() ? -1 : m->ToDexPC(native_pc);
   }
 }
@@ -1736,9 +1736,9 @@
   Class* c = m->GetDeclaringClass();
 
   JDWP::JdwpLocation location;
-  location.typeTag = c->IsInterface() ? JDWP::TT_INTERFACE : JDWP::TT_CLASS;
-  location.classId = gRegistry->Add(c);
-  location.methodId = ToMethodId(m);
+  location.type_tag = c->IsInterface() ? JDWP::TT_INTERFACE : JDWP::TT_CLASS;
+  location.class_id = gRegistry->Add(c);
+  location.method_id = ToMethodId(m);
   location.dex_pc = m->IsNative() ? -1 : dex_pc;
 
   // Note we use "NoReg" so we don't keep track of references that are
@@ -1905,14 +1905,14 @@
 
 void Dbg::WatchLocation(const JDWP::JdwpLocation* location) {
   MutexLock mu(gBreakpointsLock);
-  Method* m = FromMethodId(location->methodId);
+  Method* m = FromMethodId(location->method_id);
   gBreakpoints.push_back(Breakpoint(m, location->dex_pc));
   VLOG(jdwp) << "Set breakpoint #" << (gBreakpoints.size() - 1) << ": " << gBreakpoints[gBreakpoints.size() - 1];
 }
 
 void Dbg::UnwatchLocation(const JDWP::JdwpLocation* location) {
   MutexLock mu(gBreakpointsLock);
-  Method* m = FromMethodId(location->methodId);
+  Method* m = FromMethodId(location->method_id);
   for (size_t i = 0; i < gBreakpoints.size(); ++i) {
     if (gBreakpoints[i].method == m && gBreakpoints[i].dex_pc == location->dex_pc) {
       VLOG(jdwp) << "Removed breakpoint #" << i << ": " << gBreakpoints[i];