commit 7d5af0290108cf7b647060c5494b6c158ffcd028
author Mark Salyzyn <salyzyn@google.com> Tue Apr 04 17:06:01 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Apr 04 17:06:01 2017 +0000
tree 7f7a1b7688e6842a185ce46af9a5296ddd58c3ab
parent 81dd8e50d78ca90108b1c328bf47ad6f28f041ad
parent ef7d2f9d97eeeada591a00cc027e3085fa434167

Merge "logcat: Add -h and --help flags" am: 23e308398f am: ef7d2f9d97
am: 83f8d0b5c2

Change-Id: I3fe4e2d27f248bd6e5ed531c2f7602dfcb912460

logd/LogBuffer.cpp

diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp
index 0984e81..bdbe725 100644
--- a/logd/LogBuffer.cpp
+++ b/logd/LogBuffer.cpp
@@ -157,15 +157,17 @@
             (lenl == sizeof(android_log_event_int_t)) &&
             !fastcmp<memcmp>(msgl, msgr, sizeof(android_log_event_int_t) -
                                              sizeof(int32_t)) &&
-            (elem->getTag() == LIBLOG_LOG_TAG))
+            (elem->getTag() == LIBLOG_LOG_TAG)) {
             return SAME_LIBLOG;
+        }
     }
 
     // audit message (except sequence number) identical?
     if (last->isBinary()) {
         if (fastcmp<memcmp>(msgl, msgr, sizeof(android_log_event_string_t) -
-                                            sizeof(int32_t)))
+                                            sizeof(int32_t))) {
             return DIFFERENT;
+        }
         msgl += sizeof(android_log_event_string_t);
         lenl -= sizeof(android_log_event_string_t);
         msgr += sizeof(android_log_event_string_t);