commit 5dcde4589b00505f69070dc5663c5a043cd7bd79
author Chris Weir <chrisweir@google.com> Fri Jul 24 21:15:52 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 24 21:15:52 2020 +0000
tree 3e5b0a0d8ce1c670bc339404f9a1d2636458e91c
parent a2508b4eeeaf5f9ea4a686defd09bf25318d60a4
parent afdd8d4a834571298f2e9f511d4c61c5da326ffa

Merge "Fix netlink message printer byte counts"

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

diff --git a/automotive/can/1.0/default/libnetdevice/printer.cpp b/automotive/can/1.0/default/libnetdevice/printer.cpp
index f6c9c60..179d501 100644
--- a/automotive/can/1.0/default/libnetdevice/printer.cpp
+++ b/automotive/can/1.0/default/libnetdevice/printer.cpp
@@ -65,14 +65,13 @@
     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;