commit 94ba284db7fa61e93bb42530bbdd000701f13e5f
author Mark Salyzyn <salyzyn@google.com> Wed Feb 22 23:12:30 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 22 23:12:30 2017 +0000
tree 1c7acc66444a22047585532e76596b7708b13c1c
parent 766b5ae3237932d11296437f80bd43dc05449133
parent 1d9811292e910b07268721673ee16c2d814e1bbc

Merge "liblog: logprint followup"
am: 60c77ed265

Change-Id: I89e5d0b5b52bcd1e9b17e07fd17f14479c25791b

liblog/logprint.c

diff --git a/liblog/logprint.c b/liblog/logprint.c
index e61850d..af52528 100644
--- a/liblog/logprint.c
+++ b/liblog/logprint.c
@@ -625,14 +625,14 @@
 }
 
 static bool findChar(const char** cp, size_t* len, int c) {
-    while (*len && isspace(**cp)) {
-        ++*cp;
-        --*len;
+    while ((*len) && isspace(*(*cp))) {
+        ++(*cp);
+        --(*len);
     }
     if (c == INT_MAX) return *len;
-    if (*len && (**cp == c)) {
-        ++*cp;
-        --*len;
+    if ((*len) && (*(*cp) == c)) {
+        ++(*cp);
+        --(*len);
         return true;
     }
     return false;
@@ -991,7 +991,7 @@
 LIBLOG_ABI_PUBLIC int android_log_processBinaryLogBuffer(
         struct logger_entry *buf,
         AndroidLogEntry *entry,
-        const EventTagMap *map __unused,
+        const EventTagMap *map __unused, // only on !__ANDROID__
         char *messageBuf, int messageBufLen)
 {
     size_t inCount;