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

Commit d1adad7a authored by Glenn Kasten's avatar Glenn Kasten
Browse files

resolved conflicts for merge of 0d79b935 to master 

Change-Id: If6de8c1b1d7707918e2a60ea8583749e0127edb8
parents 029a64e0 0d79b935

media/libnbaio/NBLog.cpp

+3 −3
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ void NBLog::Reader::dump(int fd, size_t indent) 
    String8 timestamp, body;

    lost += i;

    if (lost > 0) {

        body.appendFormat("warning: lost %u bytes worth of events", lost);

        body.appendFormat("warning: lost %zu bytes worth of events", lost);

        // TODO timestamp empty here, only other choice to wait for the first timestamp event in the

        //      log to push it out.  Consider keeping the timestamp/body between calls to readAt().

        dumpLine(timestamp, body);
@@ -354,7 +354,7 @@ void NBLog::Reader::dump(int fd, size_t indent) 
        maxSec /= 10;

    }

    if (maxSec >= 0) {

        timestamp.appendFormat("[%*s]", width + 4, "");

        timestamp.appendFormat("[%*s]", (int) width + 4, "");

    }

    bool deferredTimestamp = false;

    while (i < avail) {
@@ -364,7 +364,7 @@ void NBLog::Reader::dump(int fd, size_t indent) 
        size_t advance = length + 3;

        switch (event) {

        case EVENT_STRING:

            body.appendFormat("%.*s", length, (const char *) data);

            body.appendFormat("%.*s", (int) length, (const char *) data);

            break;

        case EVENT_TIMESTAMP: {

            // already checked that length == sizeof(struct timespec);