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

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

Merge "logd: strip out empty trailing iovec" am: 6b11faeb am: d749a054

am: 657ae57b

Change-Id: I522284e11471e9eb4db091275d5461860e8c2e4b
parents 94f3ca87 657ae57b
Loading
Loading
Loading
Loading
+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);