commit ddffe38c60de18cbdae1861f0103c50539deee38
author Dan Albert <danalbert@google.com> Tue Jun 27 23:00:57 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jun 27 23:00:57 2017 +0000
tree 4c2087af3f9ecc62bae60c0ae619229145be7633
parent cb47167dea506a94dbc9d2737b1e554e48ba26c3
parent 72c3f895a5b87f9d3573f687d05034c33564c35a

Merge "Indicate that a packet was truncated."
am: 72c3f895a5

Change-Id: Id672c3c987c2ba2b12c8296b659038d95bfd48f8

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;
 }