commit c299adb2a2f27373d6e08829cda07b99fa0a238e
author Mark Salyzyn <salyzyn@google.com> Mon Jun 05 17:51:46 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jun 05 17:51:46 2017 +0000
tree 977fb57d475f7e6351b7834a9e7a678404333471
parent f25f4d432baf079e3b78155314c6f8df8b3d736b
parent 7dd716ce2a1ad517b0e0019fb6dddc86c997f1c0

Merge "liblog: add bool to android_log_event_list" am: 7dd716ce2a am: 16d6ed1845
am: e19946d27c

Change-Id: Ic0f19c3525896e92b88d2f9af69b760858b4c422

logd/LogBuffer.cpp

diff --git a/logd/LogBuffer.cpp b/logd/LogBuffer.cpp
index 76a4aff..7498325 100644
--- a/logd/LogBuffer.cpp
+++ b/logd/LogBuffer.cpp
@@ -165,15 +165,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);