Fix cpplint whitespace/comments issues

Change-Id: Iae286862c85fb8fd8901eae1204cd6d271d69496

7 files changed, 20 insertions, 20 deletions

diff --git a/runtime/jdwp/jdwp.h b/runtime/jdwp/jdwp.h
index ca118a2..010a207 100644
--- a/runtime/jdwp/jdwp.h
+++ b/runtime/jdwp/jdwp.h
@@ -152,7 +152,7 @@ struct JdwpState {
    * events at the same time, so we grab a mutex in the "set" call, and
    * release it in the "clear" call.
    */
-  //ObjectId GetWaitForEventThread();
+  // ObjectId GetWaitForEventThread();
   void SetWaitForEventThread(ObjectId threadId);
   void ClearWaitForEventThread();
 
@@ -291,7 +291,7 @@ struct JdwpState {
       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
   void SendBufferedRequest(uint32_t type, const std::vector<iovec>& iov);
 
- public: // TODO: fix privacy
+ public:  // TODO: fix privacy
   const JdwpOptions* options_;
 
  private:
@@ -308,7 +308,7 @@ struct JdwpState {
  private:
   bool run;
 
- public: // TODO: fix privacy
+ public:  // TODO: fix privacy
   JdwpNetStateBase* netState;
 
  private:
@@ -326,7 +326,7 @@ struct JdwpState {
   // Linked list of events requested by the debugger (breakpoints, class prep, etc).
   Mutex event_list_lock_;
   JdwpEvent* event_list_ GUARDED_BY(event_list_lock_);
-  int event_list_size_ GUARDED_BY(event_list_lock_); // Number of elements in event_list_.
+  int event_list_size_ GUARDED_BY(event_list_lock_);  // Number of elements in event_list_.
 
   // Used to synchronize suspension of the event thread (to avoid receiving "resume"
   // events before the thread has finished suspending itself).
diff --git a/runtime/jdwp/jdwp_constants.h b/runtime/jdwp/jdwp_constants.h
index a8db325..9fc896d 100644
--- a/runtime/jdwp/jdwp_constants.h
+++ b/runtime/jdwp/jdwp_constants.h
@@ -111,7 +111,7 @@ enum JdwpEventKind {
   EK_EXCEPTION            = 4,
   EK_USER_DEFINED         = 5,
   EK_THREAD_START         = 6,
-  EK_THREAD_DEATH         = 7, // Formerly known as THREAD_END.
+  EK_THREAD_DEATH         = 7,  // Formerly known as THREAD_END.
   EK_CLASS_PREPARE        = 8,
   EK_CLASS_UNLOAD         = 9,
   EK_CLASS_LOAD           = 10,
@@ -125,9 +125,9 @@ enum JdwpEventKind {
   EK_MONITOR_CONTENDED_ENTERED     = 44,
   EK_MONITOR_WAIT         = 45,
   EK_MONITOR_WAITED       = 46,
-  EK_VM_START             = 90, // Formerly known as VM_INIT.
+  EK_VM_START             = 90,  // Formerly known as VM_INIT.
   EK_VM_DEATH             = 99,
-  EK_VM_DISCONNECTED      = 100, // "Never sent across JDWP".
+  EK_VM_DISCONNECTED      = 100,  // "Never sent across JDWP".
 };
 std::ostream& operator<<(std::ostream& os, const JdwpEventKind& value);
 
@@ -146,7 +146,7 @@ enum JdwpModKind {
   MK_FIELD_ONLY           = 9,
   MK_STEP                 = 10,
   MK_INSTANCE_ONLY        = 11,
-  MK_SOURCE_NAME_MATCH    = 12, // Since Java 6.
+  MK_SOURCE_NAME_MATCH    = 12,  // Since Java 6.
 };
 std::ostream& operator<<(std::ostream& os, const JdwpModKind& value);
 
diff --git a/runtime/jdwp/jdwp_event.cc b/runtime/jdwp/jdwp_event.cc
index ef5a7d3..345549d 100644
--- a/runtime/jdwp/jdwp_event.cc
+++ b/runtime/jdwp/jdwp_event.cc
@@ -248,7 +248,7 @@ void JdwpState::UnregisterEventById(uint32_t requestId) {
     pEvent = pEvent->next;
   }
 
-  //LOGD("Odd: no match when removing event reqId=0x%04x", requestId);
+  // ALOGD("Odd: no match when removing event reqId=0x%04x", requestId);
 }
 
 /*
@@ -679,7 +679,7 @@ bool JdwpState::PostVMStart() {
 
   ExpandBuf* pReq = eventPrep();
   {
-    MutexLock mu(Thread::Current(), event_list_lock_); // probably don't need this here
+    MutexLock mu(Thread::Current(), event_list_lock_);  // probably don't need this here
 
     VLOG(jdwp) << "EVENT: " << EK_VM_START;
     VLOG(jdwp) << "  suspend_policy=" << suspend_policy;
@@ -773,7 +773,7 @@ bool JdwpState::PostLocationEvent(const JdwpLocation* pLoc, ObjectId thisPtr, in
       FindMatchingEvents(EK_METHOD_EXIT, &basket, match_list, &match_count);
 
       // TODO: match EK_METHOD_EXIT_WITH_RETURN_VALUE too; we need to include the 'value', though.
-      //FindMatchingEvents(EK_METHOD_EXIT_WITH_RETURN_VALUE, &basket, match_list, &match_count);
+      // FindMatchingEvents(EK_METHOD_EXIT_WITH_RETURN_VALUE, &basket, match_list, &match_count);
     }
     if (match_count != 0) {
       VLOG(jdwp) << "EVENT: " << match_list[0]->eventKind << "(" << match_count << " total) "
diff --git a/runtime/jdwp/jdwp_handler.cc b/runtime/jdwp/jdwp_handler.cc
index 9af2f83..a2efc48 100644
--- a/runtime/jdwp/jdwp_handler.cc
+++ b/runtime/jdwp/jdwp_handler.cc
@@ -1030,7 +1030,7 @@ static JdwpError TR_Frames(JdwpState*, Request& request, ExpandBuf* pReply)
   }
 
   if (actual_frame_count <= 0) {
-    return ERR_THREAD_NOT_SUSPENDED; // 0 means no managed frames (which means "in native").
+    return ERR_THREAD_NOT_SUSPENDED;  // 0 means no managed frames (which means "in native").
   }
 
   if (start_frame > actual_frame_count) {
@@ -1315,7 +1315,7 @@ static JdwpError ER_Set(JdwpState* state, Request& request, ExpandBuf* pReply)
     case MK_EXCEPTION_ONLY:
       {
         // Modifies EK_EXCEPTION events,
-        mod.exceptionOnly.refTypeId = request.ReadRefTypeId(); // null => all exceptions.
+        mod.exceptionOnly.refTypeId = request.ReadRefTypeId();  // null => all exceptions.
         mod.exceptionOnly.caught = request.ReadEnum1<uint8_t>("caught");
         mod.exceptionOnly.uncaught = request.ReadEnum1<uint8_t>("uncaught");
       }
@@ -1622,7 +1622,7 @@ static const JdwpHandlerMap gHandlers[] = {
   { 17,   1,  COR_ReflectedType, "ClassObjectReference.ReflectedType" },
 
   /* Event command set (64) */
-  { 64, 100,  NULL, "Event.Composite" }, // sent from VM to debugger, never received by VM
+  { 64, 100,  NULL, "Event.Composite" },  // sent from VM to debugger, never received by VM
 
   { 199,  1,  DDM_Chunk,        "DDM.Chunk" },
 };
diff --git a/runtime/jdwp/jdwp_priv.h b/runtime/jdwp/jdwp_priv.h
index f919f97..4e6aada 100644
--- a/runtime/jdwp/jdwp_priv.h
+++ b/runtime/jdwp/jdwp_priv.h
@@ -72,9 +72,9 @@ class JdwpNetStateBase {
   ssize_t WritePacket(ExpandBuf* pReply);
   ssize_t WriteBufferedPacket(const std::vector<iovec>& iov);
 
-  int clientSock; // Active connection to debugger.
+  int clientSock;  // Active connection to debugger.
 
-  int wake_pipe_[2]; // Used to break out of select.
+  int wake_pipe_[2];  // Used to break out of select.
 
   uint8_t input_buffer_[8192];
   size_t input_count_;
diff --git a/runtime/jdwp/jdwp_request.cc b/runtime/jdwp/jdwp_request.cc
index 440b51b..a9dd1e1 100644
--- a/runtime/jdwp/jdwp_request.cc
+++ b/runtime/jdwp/jdwp_request.cc
@@ -140,7 +140,7 @@ JdwpTypeTag Request::ReadTypeTag() {
 
 JdwpLocation Request::ReadLocation() {
   JdwpLocation location;
-  memset(&location, 0, sizeof(location)); // Allows memcmp(3) later.
+  memset(&location, 0, sizeof(location));  // Allows memcmp(3) later.
   location.type_tag = ReadTypeTag();
   location.class_id = ReadObjectId("class");
   location.method_id = ReadMethodId();
diff --git a/runtime/jdwp/object_registry.cc b/runtime/jdwp/object_registry.cc
index 54e7a8e..be2219c 100644
--- a/runtime/jdwp/object_registry.cc
+++ b/runtime/jdwp/object_registry.cc
@@ -173,15 +173,15 @@ bool ObjectRegistry::IsCollected(JDWP::ObjectId id) {
   MutexLock mu(self, lock_);
   id_iterator it = id_to_entry_.find(id);
   if (it == id_to_entry_.end()) {
-    return true; // TODO: can we report that this was an invalid id?
+    return true;  // TODO: can we report that this was an invalid id?
   }
 
   ObjectRegistryEntry& entry = *(it->second);
   if (entry.jni_reference_type == JNIWeakGlobalRefType) {
     JNIEnv* env = self->GetJniEnv();
-    return env->IsSameObject(entry.jni_reference, NULL); // Has the jweak been collected?
+    return env->IsSameObject(entry.jni_reference, NULL);  // Has the jweak been collected?
   } else {
-    return false; // We hold a strong reference, so we know this is live.
+    return false;  // We hold a strong reference, so we know this is live.
   }
 }