commit 6e401268e9a50367fe5d20dd01f3535f67b68af8
author Mark Salyzyn <salyzyn@google.com> Fri Apr 14 21:43:15 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 14 21:43:15 2017 +0000
tree 162f5bfeaafabb2a2575305a4a108cf37b35b35d
parent c0b895a32c188d4398b1adaf6bd7f91be00bd575
parent 7c94219422320348fa333e814d5e7c6cec3fa8c6

Merge changes I596b8706,I262c0377,Iaf2bee97 am: 7c94219422 am: 3447f72d43
am: fa80674a19

Change-Id: I94bad3a2c64194c2377de4277c066bbd3030f823

logd/LogBuffer.cpp

diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp
index 0c7019a..8ef9328 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);