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

Commit 5dcde458 authored by Chris Weir's avatar Chris Weir Committed by Android (Google) Code Review
Browse files

Merge "Fix netlink message printer byte counts"

parents a2508b4e afdd8d4a

automotive/can/1.0/default/libnetdevice/printer.cpp

+3 −4
Original line number Diff line number Diff line
@@ -65,14 +65,13 @@ static void toStream(std::stringstream& ss, const nlbuf<uint8_t> data) { 
    const auto rawData = data.getRaw();

    const auto dataLen = rawData.len();

    ss << std::hex;

    if (dataLen > 16) ss << std::endl << " 0000 ";

    int i = 0;

    for (const auto byte : rawData) {

        if (i++ > 0) ss << ' ';

        ss << std::setw(2) << unsigned(byte);

        if (i % 16 == 0) {

        if (i % 16 == 0 && dataLen > 16) {

            ss << std::endl << ' ' << std::dec << std::setw(4) << i << std::hex;

        }

        if (i++ > 0 || dataLen > 16) ss << ' ';

        ss << std::setw(2) << unsigned(byte);

    }

    ss << std::dec;

    if (dataLen > 16) ss << std::endl;