diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2016-04-19 00:37:16 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-19 00:37:16 +0200 |
| commit | ed4c0c4ca04943a79d2dc7ac2c095ed6ca20f749 (patch) | |
| tree | 543fc407741ac3df540e3bfe4c36688e3bda6d80 /uncrypt/uncrypt.cpp | |
| parent | Merge "Fix IWYU errors." am: 51dcd0d (diff) | |
| parent | Merge "Fix google-runtime-int warnings." am: a1f4a1e (diff) | |
| download | android_bootable_recovery-ed4c0c4ca04943a79d2dc7ac2c095ed6ca20f749.tar android_bootable_recovery-ed4c0c4ca04943a79d2dc7ac2c095ed6ca20f749.tar.gz android_bootable_recovery-ed4c0c4ca04943a79d2dc7ac2c095ed6ca20f749.tar.bz2 android_bootable_recovery-ed4c0c4ca04943a79d2dc7ac2c095ed6ca20f749.tar.lz android_bootable_recovery-ed4c0c4ca04943a79d2dc7ac2c095ed6ca20f749.tar.xz android_bootable_recovery-ed4c0c4ca04943a79d2dc7ac2c095ed6ca20f749.tar.zst android_bootable_recovery-ed4c0c4ca04943a79d2dc7ac2c095ed6ca20f749.zip | |
Diffstat (limited to '')
| -rw-r--r-- | uncrypt/uncrypt.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/uncrypt/uncrypt.cpp b/uncrypt/uncrypt.cpp index 0e14da13f..5697712aa 100644 --- a/uncrypt/uncrypt.cpp +++ b/uncrypt/uncrypt.cpp @@ -262,8 +262,9 @@ static int produce_block_map(const char* path, const char* map_file, const char* std::vector<int> ranges; - std::string s = android::base::StringPrintf("%s\n%" PRId64 " %ld\n", - blk_dev, sb.st_size, static_cast<long>(sb.st_blksize)); + std::string s = android::base::StringPrintf("%s\n%" PRId64 " %" PRId64 "\n", + blk_dev, static_cast<int64_t>(sb.st_size), + static_cast<int64_t>(sb.st_blksize)); if (!android::base::WriteStringToFd(s, mapfd)) { ALOGE("failed to write %s: %s", tmp_map_file.c_str(), strerror(errno)); return -1; |