PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix google-runtime-int warnings." am: a1f4a1e

Browse Source 
am: bcad1d1

* commit 'bcad1d1ced730478c94f951034d252e777661332':
  Fix google-runtime-int warnings.

Change-Id: Ifad31026502e3375f4833899056662da540319b5
This commit is contained in:
Chih-hung Hsieh
2016-04-18 22:34:41 +00:00
committed by android-build-merger
parent d911d81450 bcad1d1ced
commit 0231e7016d
12 changed files with 53 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
uncrypt/uncrypt.cpp
View File

@@ -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;