diff options
| author | Josh Gao <jmgao@google.com> | 2020-03-26 14:06:55 -0700 |
|---|---|---|
| committer | Josh Gao <jmgao@google.com> | 2020-04-01 13:09:29 -0700 |
| commit | 6e697f2f8ca3f4078c38a0d08b3ec1bcbb038132 (patch) | |
| tree | 0a8cb84dec947379f9123abd9092dddeece28cca /adb/daemon/file_sync_service.cpp | |
| parent | 31d42aa73c21d18f37eef9d843fcf25964c084bd (diff) | |
adb: move things around to prepare to add LZ4.
Bug: https://issuetracker.google.com/150827486
Test: m adb com.android.adbd.apex
Change-Id: I038d1df4f179ddb23102016d781c9bd90da5a546
Diffstat (limited to 'adb/daemon/file_sync_service.cpp')
| -rw-r--r-- | adb/daemon/file_sync_service.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/adb/daemon/file_sync_service.cpp b/adb/daemon/file_sync_service.cpp index 07f6e65e8..c298d6053 100644 --- a/adb/daemon/file_sync_service.cpp +++ b/adb/daemon/file_sync_service.cpp @@ -57,7 +57,7 @@ #include "adb_io.h" #include "adb_trace.h" #include "adb_utils.h" -#include "brotli_utils.h" +#include "compression_utils.h" #include "file_sync_protocol.h" #include "security_log_tags.h" #include "sysdeps/errno.h" @@ -288,8 +288,8 @@ static bool handle_send_file_compressed(borrowed_fd s, unique_fd fd, uint32_t* t while (true) { std::span<char> output; - BrotliDecodeResult result = decoder.Decode(&output); - if (result == BrotliDecodeResult::Error) { + DecodeResult result = decoder.Decode(&output); + if (result == DecodeResult::Error) { SendSyncFailErrno(s, "decompress failed"); return false; } @@ -299,14 +299,14 @@ static bool handle_send_file_compressed(borrowed_fd s, unique_fd fd, uint32_t* t return false; } - if (result == BrotliDecodeResult::NeedInput) { + if (result == DecodeResult::NeedInput) { break; - } else if (result == BrotliDecodeResult::MoreOutput) { + } else if (result == DecodeResult::MoreOutput) { continue; - } else if (result == BrotliDecodeResult::Done) { + } else if (result == DecodeResult::Done) { break; } else { - LOG(FATAL) << "invalid BrotliDecodeResult: " << static_cast<int>(result); + LOG(FATAL) << "invalid DecodeResult: " << static_cast<int>(result); } } } @@ -633,8 +633,8 @@ static bool recv_compressed(borrowed_fd s, unique_fd fd) { while (true) { Block output; - BrotliEncodeResult result = encoder.Encode(&output); - if (result == BrotliEncodeResult::Error) { + EncodeResult result = encoder.Encode(&output); + if (result == EncodeResult::Error) { SendSyncFailErrno(s, "compress failed"); return false; } @@ -647,12 +647,12 @@ static bool recv_compressed(borrowed_fd s, unique_fd fd) { } } - if (result == BrotliEncodeResult::Done) { + if (result == EncodeResult::Done) { sending = false; break; - } else if (result == BrotliEncodeResult::NeedInput) { + } else if (result == EncodeResult::NeedInput) { break; - } else if (result == BrotliEncodeResult::MoreOutput) { + } else if (result == EncodeResult::MoreOutput) { continue; } } |