ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Minor refactor to support strings with embedded zeros."

Browse source
This commit is contained in:
Treehugger Robot 2018-12-21 00:59:48 +00:00 • committed by Gerrit Code Review
commit db2ffaa0f0
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
adb/adb_io.cpp
View file

@ -38,7 +38,8 @@ bool SendProtocolString(int fd, const std::string& s) {
// The cost of sending two strings outweighs the cost of formatting. // The cost of sending two strings outweighs the cost of formatting.
// "adb sync" performance is affected by this. // "adb sync" performance is affected by this.
return WriteFdFmt(fd, "%04x%.*s", length, length, s.c_str()); auto str = android::base::StringPrintf("%04x", length).append(s);
return WriteFdExactly(fd, str);
} }
bool ReadProtocolString(int fd, std::string* s, std::string* error) { bool ReadProtocolString(int fd, std::string* s, std::string* error) {