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

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

Merge "logd: strip out empty trailing iovec" 

am: 6b11faeb

Change-Id: Ib6244cf3cd089c44dd71524e09f6d4a2227c65bd
parents ee713720 6b11faeb

logd/LogBufferElement.cpp

+3 −1
Original line number Diff line number Diff line
@@ -235,7 +235,9 @@ log_time LogBufferElement::flushTo(SocketClient* reader, LogBuffer* parent, 
    }

    iovec[1].iov_len = entry.len;



    log_time retval = reader->sendDatav(iovec, 2) ? FLUSH_ERROR : mRealTime;

    log_time retval = reader->sendDatav(iovec, 1 + (entry.len != 0))

                          ? FLUSH_ERROR

                          : mRealTime;



    if (buffer) free(buffer);