am f69863b3: Fix cpplint whitespace/newline issues

* commit 'f69863b3039fc621ff4250e262d2a024d5e79ec8':
  Fix cpplint whitespace/newline issues

5 files changed, 34 insertions, 12 deletions

diff --git a/runtime/base/logging.cc b/runtime/base/logging.cc
index 2c6b6a8..bf19e8d 100644
--- a/runtime/base/logging.cc
+++ b/runtime/base/logging.cc
@@ -87,14 +87,28 @@ void InitLogging(char* argv[]) {
     std::string spec(specs[i]);
     if (spec.size() == 3 && StartsWith(spec, "*:")) {
       switch (spec[2]) {
-        case 'v': gMinimumLogSeverity = VERBOSE; continue;
-        case 'd': gMinimumLogSeverity = DEBUG; continue;
-        case 'i': gMinimumLogSeverity = INFO; continue;
-        case 'w': gMinimumLogSeverity = WARNING; continue;
-        case 'e': gMinimumLogSeverity = ERROR; continue;
-        case 'f': gMinimumLogSeverity = FATAL; continue;
+        case 'v':
+          gMinimumLogSeverity = VERBOSE;
+          continue;
+        case 'd':
+          gMinimumLogSeverity = DEBUG;
+          continue;
+        case 'i':
+          gMinimumLogSeverity = INFO;
+          continue;
+        case 'w':
+          gMinimumLogSeverity = WARNING;
+          continue;
+        case 'e':
+          gMinimumLogSeverity = ERROR;
+          continue;
+        case 'f':
+          gMinimumLogSeverity = FATAL;
+          continue;
         // liblog will even suppress FATAL if you say 's' for silent, but that's crazy!
-        case 's': gMinimumLogSeverity = FATAL; continue;
+        case 's':
+          gMinimumLogSeverity = FATAL;
+          continue;
       }
     }
     LOG(FATAL) << "unsupported '" << spec << "' in ANDROID_LOG_TAGS (" << tags << ")";
diff --git a/runtime/debugger.h b/runtime/debugger.h
index 94f3cbe..28a2c60 100644
--- a/runtime/debugger.h
+++ b/runtime/debugger.h
@@ -238,7 +238,7 @@ class Dbg {
   static JDWP::JdwpTag GetFieldBasicTag(JDWP::FieldId field_id)
       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
   static JDWP::JdwpTag GetStaticFieldBasicTag(JDWP::FieldId field_id)
-      SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);;
+      SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
   static JDWP::JdwpError GetFieldValue(JDWP::ObjectId object_id, JDWP::FieldId field_id,
                                        JDWP::ExpandBuf* pReply)
       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc
index 21a0725..6423a0d 100644
--- a/runtime/gc/heap.cc
+++ b/runtime/gc/heap.cc
@@ -1539,7 +1539,7 @@ collector::GcType Heap::WaitForConcurrentGcToComplete(Thread* self) {
           gc_complete_cond_->Wait(self);
         }
         last_gc_type = last_gc_type_;
-        wait_time = NanoTime() - wait_start;;
+        wait_time = NanoTime() - wait_start;
         total_wait_time_ += wait_time;
       }
       if (wait_time > kLongGcPauseThreshold) {
diff --git a/runtime/runtime_support.h b/runtime/runtime_support.h
index 051981f..a6c3b38 100644
--- a/runtime/runtime_support.h
+++ b/runtime/runtime_support.h
@@ -176,8 +176,12 @@ static inline mirror::Field* FindFieldFast(uint32_t field_idx,
     case StaticObjectWrite:      is_primitive = false; is_set = true;  is_static = true;  break;
     case StaticPrimitiveRead:    is_primitive = true;  is_set = false; is_static = true;  break;
     case StaticPrimitiveWrite:   is_primitive = true;  is_set = true;  is_static = true;  break;
-    default: LOG(FATAL) << "UNREACHABLE";  // Assignment below to avoid GCC warnings.
-             is_primitive = true;  is_set = true;  is_static = true;  break;
+    default:
+      LOG(FATAL) << "UNREACHABLE";  // Assignment below to avoid GCC warnings.
+      is_primitive = true;
+      is_set = true;
+      is_static = true;
+      break;
   }
   if (UNLIKELY(resolved_field->IsStatic() != is_static)) {
     // Incompatible class change.
diff --git a/runtime/thread.cc b/runtime/thread.cc
index c0be4d2..76984c1 100644
--- a/runtime/thread.cc
+++ b/runtime/thread.cc
@@ -1666,7 +1666,11 @@ static const EntryPointInfo gThreadEntryPointInfo[] = {
 void Thread::DumpThreadOffset(std::ostream& os, uint32_t offset, size_t size_of_pointers) {
   CHECK_EQ(size_of_pointers, 4U); // TODO: support 64-bit targets.
 
-#define DO_THREAD_OFFSET(x) if (offset == static_cast<uint32_t>(OFFSETOF_VOLATILE_MEMBER(Thread, x))) { os << # x; return; }
+#define DO_THREAD_OFFSET(x) \
+    if (offset == static_cast<uint32_t>(OFFSETOF_VOLATILE_MEMBER(Thread, x))) { \
+      os << # x; \
+      return; \
+    }
   DO_THREAD_OFFSET(state_and_flags_);
   DO_THREAD_OFFSET(card_table_);
   DO_THREAD_OFFSET(exception_);