commit 4e6dc7f7f89e3857dd41922711e6b3ffae781ba8
author Mark Salyzyn <salyzyn@google.com> Wed Feb 22 23:33:43 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 22 23:33:43 2017 +0000
tree 73c34225a34edb2c5414bde53c6fe92ed6e8dfe4
parent f159a977f285b3ef5161eeb5bfa52def5cce158d
parent b254e489341c7507f9e37855e6ce3255eaf8bb82

Merge "liblog: logprint followup" am: 60c77ed265 am: 7cb2658b26
am: f70743f2ae

Change-Id: Ie969e99b7b4e6e743bfb1087aebdf2b4bd7cc05f

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;