am 9e376744: Merge "adb: tracing: don\'t make strings if runtime tracing is disabled"

* commit '9e376744d39c8fee2f8da4f693e3bc74291f7a45':
  adb: tracing: don't make strings if runtime tracing is disabled
This commit is contained in:
Elliott Hughes 2015-01-28 00:17:31 +00:00 committed by Android Git Automerger
commit 13aa2a4e32
1 changed files with 6 additions and 2 deletions

View File

@ -1165,7 +1165,9 @@ int readx(int fd, void *ptr, size_t len)
#if ADB_TRACE
D("readx: fd=%d wanted=%zu got=%zu\n", fd, len0, len0 - len);
dump_hex( ptr, len0 );
if (ADB_TRACING) {
dump_hex( ptr, len0 );
}
#endif
return 0;
}
@ -1177,7 +1179,9 @@ int writex(int fd, const void *ptr, size_t len)
#if ADB_TRACE
D("writex: fd=%d len=%d: ", fd, (int)len);
dump_hex( ptr, len );
if (ADB_TRACING) {
dump_hex( ptr, len );
}
#endif
while(len > 0) {
r = adb_write(fd, p, len);