commit c0b895a32c188d4398b1adaf6bd7f91be00bd575
author Mark Salyzyn <salyzyn@google.com> Fri Apr 14 21:05:03 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 14 21:05:03 2017 +0000
tree f107dccb1dc6bf10836721957830f51810fc4e7d
parent 7b2f336c97d78d08c416f4c0ff6c74ffaaaf54f2
parent 45d586cfa9fc851dca090f07891a3c38ad796639

Merge "logd: statistics truncate name" am: 45d586cfa9 am: 7f9719be48
am: 00c87bcf73

Change-Id: I81de78de58de4809004a42a3b352bd25780d5e05

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);