diff options
author | Tao Bao <tbao@google.com> | 2015-08-10 19:29:54 +0200 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-10 19:29:54 +0200 |
commit | 7f89389a0b55d13ee1c9026c33f17dc1cc9c7ace (patch) | |
tree | f06f32b0db7a162ec7c33170d1f4b87454762962 /applypatch | |
parent | am e67104a6: Merge "Use CPPFLAGS instead of CFLAGS." (diff) | |
parent | Merge "updater: Clean up char* with std::string." (diff) | |
download | android_bootable_recovery-7f89389a0b55d13ee1c9026c33f17dc1cc9c7ace.tar android_bootable_recovery-7f89389a0b55d13ee1c9026c33f17dc1cc9c7ace.tar.gz android_bootable_recovery-7f89389a0b55d13ee1c9026c33f17dc1cc9c7ace.tar.bz2 android_bootable_recovery-7f89389a0b55d13ee1c9026c33f17dc1cc9c7ace.tar.lz android_bootable_recovery-7f89389a0b55d13ee1c9026c33f17dc1cc9c7ace.tar.xz android_bootable_recovery-7f89389a0b55d13ee1c9026c33f17dc1cc9c7ace.tar.zst android_bootable_recovery-7f89389a0b55d13ee1c9026c33f17dc1cc9c7ace.zip |
Diffstat (limited to 'applypatch')
-rw-r--r-- | applypatch/applypatch.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/applypatch/applypatch.cpp b/applypatch/applypatch.cpp index 751d3e392..1767761a8 100644 --- a/applypatch/applypatch.cpp +++ b/applypatch/applypatch.cpp @@ -31,6 +31,7 @@ #include "applypatch.h" #include "mtdutils/mtdutils.h" #include "edify/expr.h" +#include "print_sha1.h" static int LoadPartitionContents(const char* filename, FileContents* file); static ssize_t FileSink(const unsigned char* data, ssize_t len, void* token); @@ -43,7 +44,6 @@ static int GenerateTarget(FileContents* source_file, const uint8_t target_sha1[SHA_DIGEST_SIZE], size_t target_size, const Value* bonus_data); -static std::string short_sha1(const uint8_t sha1[SHA_DIGEST_SIZE]); static bool mtd_partitions_scanned = false; @@ -630,16 +630,6 @@ int CacheSizeCheck(size_t bytes) { } } -static std::string short_sha1(const uint8_t sha1[SHA_DIGEST_SIZE]) { - const char* hex = "0123456789abcdef"; - std::string result = ""; - for (size_t i = 0; i < 4; ++i) { - result.push_back(hex[(sha1[i]>>4) & 0xf]); - result.push_back(hex[sha1[i] & 0xf]); - } - return result; -} - // This function applies binary patches to files in a way that is safe // (the original file is not touched until we have the desired // replacement for it) and idempotent (it's okay to run this program |