From b9c1b51e45b845debb76d8658edabca70ca56079 Mon Sep 17 00:00:00 2001 From: Kate Stone Date: Tue, 6 Sep 2016 20:57:50 +0000 Subject: =?UTF-8?q?***=20This=20commit=20represents=20a=20complete=20refor?= =?UTF-8?q?matting=20of=20the=20LLDB=20source=20code=20***=20to=20conform?= =?UTF-8?q?=20to=20clang-format=E2=80=99s=20LLVM=20style.=20=20This=20kind?= =?UTF-8?q?=20of=20mass=20change=20has=20***=20two=20obvious=20implication?= =?UTF-8?q?s:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Firstly, merging this particular commit into a downstream fork may be a huge effort. Alternatively, it may be worth merging all changes up to this commit, performing the same reformatting operation locally, and then discarding the merge for this particular commit. The commands used to accomplish this reformatting were as follows (with current working directory as the root of the repository): find . \( -iname "*.c" -or -iname "*.cpp" -or -iname "*.h" -or -iname "*.mm" \) -exec clang-format -i {} + find . -iname "*.py" -exec autopep8 --in-place --aggressive --aggressive {} + ; The version of clang-format used was 3.9.0, and autopep8 was 1.2.4. Secondly, “blame” style tools will generally point to this commit instead of a meaningful prior commit. There are alternatives available that will attempt to look through this change and find the appropriate prior commit. YMMV. llvm-svn: 280751 --- lldb/source/Host/common/FileSystem.cpp | 131 +++++++++++++++------------------ 1 file changed, 60 insertions(+), 71 deletions(-) (limited to 'lldb/source/Host/common/FileSystem.cpp') diff --git a/lldb/source/Host/common/FileSystem.cpp b/lldb/source/Host/common/FileSystem.cpp index 5a5dbc7..c865bf3 100644 --- a/lldb/source/Host/common/FileSystem.cpp +++ b/lldb/source/Host/common/FileSystem.cpp @@ -20,84 +20,73 @@ using namespace lldb_private; namespace { -bool -CalcMD5(const FileSpec &file_spec, uint64_t offset, uint64_t length, llvm::MD5::MD5Result &md5_result) -{ - llvm::MD5 md5_hash; - std::ifstream file(file_spec.GetPath(), std::ios::binary); - if (!file.is_open()) - return false; - - if (offset > 0) - file.seekg(offset, file.beg); - - std::vector read_buf(4096); - uint64_t total_read_bytes = 0; - while (!file.eof()) - { - const uint64_t to_read = (length > 0) ? - std::min(static_cast(read_buf.size()), length - total_read_bytes) : - read_buf.size(); - if (to_read == 0) - break; - - file.read(&read_buf[0], to_read); - const auto read_bytes = file.gcount(); - if (read_bytes == 0) - break; - - md5_hash.update(llvm::StringRef(&read_buf[0], read_bytes)); - total_read_bytes += read_bytes; - } - - md5_hash.final(md5_result); - return true; +bool CalcMD5(const FileSpec &file_spec, uint64_t offset, uint64_t length, + llvm::MD5::MD5Result &md5_result) { + llvm::MD5 md5_hash; + std::ifstream file(file_spec.GetPath(), std::ios::binary); + if (!file.is_open()) + return false; + + if (offset > 0) + file.seekg(offset, file.beg); + + std::vector read_buf(4096); + uint64_t total_read_bytes = 0; + while (!file.eof()) { + const uint64_t to_read = + (length > 0) ? std::min(static_cast(read_buf.size()), + length - total_read_bytes) + : read_buf.size(); + if (to_read == 0) + break; + + file.read(&read_buf[0], to_read); + const auto read_bytes = file.gcount(); + if (read_bytes == 0) + break; + + md5_hash.update(llvm::StringRef(&read_buf[0], read_bytes)); + total_read_bytes += read_bytes; + } + + md5_hash.final(md5_result); + return true; } -} // namespace +} // namespace -bool -FileSystem::CalculateMD5(const FileSpec &file_spec, uint64_t &low, uint64_t &high) -{ - return CalculateMD5(file_spec, 0, 0, low, high); +bool FileSystem::CalculateMD5(const FileSpec &file_spec, uint64_t &low, + uint64_t &high) { + return CalculateMD5(file_spec, 0, 0, low, high); } -bool -FileSystem::CalculateMD5(const FileSpec &file_spec, - uint64_t offset, - uint64_t length, - uint64_t &low, - uint64_t &high) -{ - llvm::MD5::MD5Result md5_result; - if (!CalcMD5(file_spec, offset, length, md5_result)) - return false; - - const auto uint64_res = reinterpret_cast(md5_result); - high = uint64_res[0]; - low = uint64_res[1]; - - return true; +bool FileSystem::CalculateMD5(const FileSpec &file_spec, uint64_t offset, + uint64_t length, uint64_t &low, uint64_t &high) { + llvm::MD5::MD5Result md5_result; + if (!CalcMD5(file_spec, offset, length, md5_result)) + return false; + + const auto uint64_res = reinterpret_cast(md5_result); + high = uint64_res[0]; + low = uint64_res[1]; + + return true; } -bool -FileSystem::CalculateMD5AsString(const FileSpec &file_spec, std::string& digest_str) -{ - return CalculateMD5AsString(file_spec, 0, 0, digest_str); +bool FileSystem::CalculateMD5AsString(const FileSpec &file_spec, + std::string &digest_str) { + return CalculateMD5AsString(file_spec, 0, 0, digest_str); } -bool -FileSystem::CalculateMD5AsString(const FileSpec &file_spec, - uint64_t offset, - uint64_t length, - std::string& digest_str) -{ - llvm::MD5::MD5Result md5_result; - if (!CalcMD5(file_spec, offset, length, md5_result)) - return false; - - llvm::SmallString<32> result_str; - llvm::MD5::stringifyResult(md5_result, result_str); - digest_str = result_str.c_str(); - return true; +bool FileSystem::CalculateMD5AsString(const FileSpec &file_spec, + uint64_t offset, uint64_t length, + std::string &digest_str) { + llvm::MD5::MD5Result md5_result; + if (!CalcMD5(file_spec, offset, length, md5_result)) + return false; + + llvm::SmallString<32> result_str; + llvm::MD5::stringifyResult(md5_result, result_str); + digest_str = result_str.c_str(); + return true; } -- cgit v1.1