Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f70743f2 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "liblog: logprint followup" am: 60c77ed2 

am: 7cb2658b

Change-Id: I4f8409ad193976b2d8089cbf7982fb2255c29cdd
parents b17ca7f3 7cb2658b

liblog/logprint.c

+7 −7
Original line number Diff line number Diff line
@@ -625,14 +625,14 @@ static inline uint64_t get8LE(const uint8_t* src) 
}



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 @@ no_room: 
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;