commit fc45f280b6be557e4a037236ee2a3070ec792de3
author Dan Albert <danalbert@google.com> Tue Jun 27 13:26:14 2017 -0700
committer Dan Albert <danalbert@google.com> Tue Jun 27 13:26:14 2017 -0700
tree 592e2df8c7d3281e8b326feec786bd798a96a2b6
parent 1046bc5b64951e88435bd312f48409627c46d88a

Indicate that a packet was truncated.

Test: make checkbuild, check adb log
Bug: None
Change-Id: I0006ed284697f01966fdd79ca0b05dbc6d2eecf0

adb_utils.cpp

diff --git a/adb_utils.cpp b/adb_utils.cpp
index bb26e70..b236fb3 100644
--- a/adb_utils.cpp
+++ b/adb_utils.cpp
@@ -157,7 +157,12 @@
 }
 
 std::string dump_hex(const void* data, size_t byte_count) {
-    byte_count = std::min(byte_count, size_t(16));
+    size_t truncate_len = 16;
+    bool truncated = false;
+    if (byte_count > truncate_len) {
+        byte_count = truncate_len;
+        truncated = true;
+    }
 
     const uint8_t* p = reinterpret_cast<const uint8_t*>(data);
 
@@ -172,6 +177,10 @@
         line.push_back(isprint(ch) ? ch : '.');
     }
 
+    if (truncated) {
+        line += " [truncated]";
+    }
+
     return line;
 }