summaryrefslogtreecommitdiffstats
path: root/uncrypt/uncrypt.cpp
diff options
context:
space:
mode:
authorChih-hung Hsieh <chh@google.com>2016-04-19 00:34:41 +0200
committerandroid-build-merger <android-build-merger@google.com>2016-04-19 00:34:41 +0200
commit0231e7016dfe56625d6d01a1de468cd23d9cf01a (patch)
tree543fc407741ac3df540e3bfe4c36688e3bda6d80 /uncrypt/uncrypt.cpp
parentMerge "Fix IWYU errors." am: 51dcd0d (diff)
parentMerge "Fix google-runtime-int warnings." (diff)
downloadandroid_bootable_recovery-0231e7016dfe56625d6d01a1de468cd23d9cf01a.tar
android_bootable_recovery-0231e7016dfe56625d6d01a1de468cd23d9cf01a.tar.gz
android_bootable_recovery-0231e7016dfe56625d6d01a1de468cd23d9cf01a.tar.bz2
android_bootable_recovery-0231e7016dfe56625d6d01a1de468cd23d9cf01a.tar.lz
android_bootable_recovery-0231e7016dfe56625d6d01a1de468cd23d9cf01a.tar.xz
android_bootable_recovery-0231e7016dfe56625d6d01a1de468cd23d9cf01a.tar.zst
android_bootable_recovery-0231e7016dfe56625d6d01a1de468cd23d9cf01a.zip
Diffstat (limited to 'uncrypt/uncrypt.cpp')
-rw-r--r--uncrypt/uncrypt.cpp5
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;