diff options
| author | Chih-hung Hsieh <chh@google.com> | 2016-04-18 22:34:41 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-18 22:34:41 +0000 |
| commit | 0231e7016dfe56625d6d01a1de468cd23d9cf01a (patch) | |
| tree | 543fc407741ac3df540e3bfe4c36688e3bda6d80 /uncrypt/uncrypt.cpp | |
| parent | d911d81450570f5b9df46dce44898f47ea3b11de (diff) | |
| parent | bcad1d1ced730478c94f951034d252e777661332 (diff) | |
| download | android_bootable_recovery-0231e7016dfe56625d6d01a1de468cd23d9cf01a.tar.gz android_bootable_recovery-0231e7016dfe56625d6d01a1de468cd23d9cf01a.tar.bz2 android_bootable_recovery-0231e7016dfe56625d6d01a1de468cd23d9cf01a.zip | |
Merge "Fix google-runtime-int warnings." am: a1f4a1e
am: bcad1d1
* commit 'bcad1d1ced730478c94f951034d252e777661332':
Fix google-runtime-int warnings.
Change-Id: Ifad31026502e3375f4833899056662da540319b5
Diffstat (limited to 'uncrypt/uncrypt.cpp')
| -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 0e14da13..5697712a 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; |