Fix some DDMS stuff I'd broken, and fix HexDump's double-spacing.
Change-Id: I6583458a818406197744cc640b0993f73cfd5384
diff --git a/src/jdwp/jdwp_bits.h b/src/jdwp/jdwp_bits.h
index 5e5b120..faa3960 100644
--- a/src/jdwp/jdwp_bits.h
+++ b/src/jdwp/jdwp_bits.h
@@ -159,13 +159,6 @@
*dst += sizeof(value);
}
-// @deprecated
-static inline void SetUtf8String(uint8_t* buf, const uint8_t* str) {
- uint32_t strLen = strlen((const char*)str);
- Set4BE(buf, strLen);
- memcpy(buf + sizeof(uint32_t), str, strLen);
-}
-
} // namespace JDWP
} // namespace art
diff --git a/src/jdwp/jdwp_expand_buf.cc b/src/jdwp/jdwp_expand_buf.cc
index 71931e1..f5e24b2 100644
--- a/src/jdwp/jdwp_expand_buf.cc
+++ b/src/jdwp/jdwp_expand_buf.cc
@@ -153,6 +153,12 @@
pBuf->curLen += sizeof(val);
}
+static void SetUtf8String(uint8_t* buf, const uint8_t* str) {
+ uint32_t strLen = strlen((const char*)str);
+ Set4BE(buf, strLen);
+ memcpy(buf + sizeof(uint32_t), str, strLen);
+}
+
/*
* Add a UTF8 string as a 4-byte length followed by a non-NULL-terminated
* string.