am 741d9e1a: am 8b63df9e: Merge "Fix format-string-related warnings for size of various types."
* commit '741d9e1a0bc4bc1d8d4a5c25429c206428b134e8':
Fix format-string-related warnings for size of various types.
diff --git a/bcinfo/tools/main.cpp b/bcinfo/tools/main.cpp
index 6bcdbdf..64969f3 100644
--- a/bcinfo/tools/main.cpp
+++ b/bcinfo/tools/main.cpp
@@ -121,19 +121,19 @@
return 2;
}
- fprintf(info, "exportVarCount: %u\n", ME->getExportVarCount());
+ fprintf(info, "exportVarCount: %zu\n", ME->getExportVarCount());
const char **varNameList = ME->getExportVarNameList();
for (size_t i = 0; i < ME->getExportVarCount(); i++) {
fprintf(info, "%s\n", varNameList[i]);
}
- fprintf(info, "exportFuncCount: %u\n", ME->getExportFuncCount());
+ fprintf(info, "exportFuncCount: %zu\n", ME->getExportFuncCount());
const char **funcNameList = ME->getExportFuncNameList();
for (size_t i = 0; i < ME->getExportFuncCount(); i++) {
fprintf(info, "%s\n", funcNameList[i]);
}
- fprintf(info, "exportForEachCount: %u\n",
+ fprintf(info, "exportForEachCount: %zu\n",
ME->getExportForEachSignatureCount());
const char **nameList = ME->getExportForEachNameList();
const uint32_t *sigList = ME->getExportForEachSignatureList();
@@ -143,7 +143,7 @@
inputCountList[i]);
}
- fprintf(info, "objectSlotCount: %u\n", ME->getObjectSlotCount());
+ fprintf(info, "objectSlotCount: %zu\n", ME->getObjectSlotCount());
const uint32_t *slotList = ME->getObjectSlotList();
for (size_t i = 0; i < ME->getObjectSlotCount(); i++) {
fprintf(info, "%u\n", slotList[i]);
@@ -172,43 +172,43 @@
break;
}
- printf("exportVarCount: %u\n", ME->getExportVarCount());
+ printf("exportVarCount: %zu\n", ME->getExportVarCount());
const char **varNameList = ME->getExportVarNameList();
for (size_t i = 0; i < ME->getExportVarCount(); i++) {
- printf("var[%u]: %s\n", i, varNameList[i]);
+ printf("var[%zu]: %s\n", i, varNameList[i]);
}
printf("\n");
- printf("exportFuncCount: %u\n", ME->getExportFuncCount());
+ printf("exportFuncCount: %zu\n", ME->getExportFuncCount());
const char **funcNameList = ME->getExportFuncNameList();
for (size_t i = 0; i < ME->getExportFuncCount(); i++) {
- printf("func[%u]: %s\n", i, funcNameList[i]);
+ printf("func[%zu]: %s\n", i, funcNameList[i]);
}
printf("\n");
- printf("exportForEachSignatureCount: %u\n",
+ printf("exportForEachSignatureCount: %zu\n",
ME->getExportForEachSignatureCount());
const char **nameList = ME->getExportForEachNameList();
const uint32_t *sigList = ME->getExportForEachSignatureList();
const uint32_t *inputCountList = ME->getExportForEachInputCountList();
for (size_t i = 0; i < ME->getExportForEachSignatureCount(); i++) {
- printf("exportForEachSignatureList[%u]: %s - %u - %u\n", i, nameList[i],
+ printf("exportForEachSignatureList[%zu]: %s - %u - %u\n", i, nameList[i],
sigList[i], inputCountList[i]);
}
printf("\n");
- printf("pragmaCount: %u\n", ME->getPragmaCount());
+ printf("pragmaCount: %zu\n", ME->getPragmaCount());
const char **keyList = ME->getPragmaKeyList();
const char **valueList = ME->getPragmaValueList();
for (size_t i = 0; i < ME->getPragmaCount(); i++) {
- printf("pragma[%u]: %s - %s\n", i, keyList[i], valueList[i]);
+ printf("pragma[%zu]: %s - %s\n", i, keyList[i], valueList[i]);
}
printf("\n");
- printf("objectSlotCount: %u\n", ME->getObjectSlotCount());
+ printf("objectSlotCount: %zu\n", ME->getObjectSlotCount());
const uint32_t *slotList = ME->getObjectSlotList();
for (size_t i = 0; i < ME->getObjectSlotCount(); i++) {
- printf("objectSlotList[%u]: %u\n", i, slotList[i]);
+ printf("objectSlotList[%zu]: %u\n", i, slotList[i]);
}
printf("\n");
diff --git a/lib/ExecutionEngine/ELFObjectLoaderImpl.cpp b/lib/ExecutionEngine/ELFObjectLoaderImpl.cpp
index 867b7ab..a013b18 100644
--- a/lib/ExecutionEngine/ELFObjectLoaderImpl.cpp
+++ b/lib/ExecutionEngine/ELFObjectLoaderImpl.cpp
@@ -84,7 +84,7 @@
if (elf_header->e_shoff > pDebugImgSize) {
#ifdef __LP64__
ALOGE("Invalid section header table offset found! (e_shoff = %ld)",
- elf_header->e_shoff);
+ static_cast<unsigned long>(elf_header->e_shoff));
#else
ALOGE("Invalid section header table offset found! (e_shoff = %d)",
elf_header->e_shoff);
@@ -96,8 +96,8 @@
sizeof(llvm::ELF::Elf32_Shdr) * elf_header->e_shnum) > pDebugImgSize) {
#ifdef __LP64__
ALOGE("Invalid image supplied (debug image doesn't contain all the section"
- "header or corrupted image)! (e_shoff = %ld, e_shnum = %d)",
- elf_header->e_shoff, elf_header->e_shnum);
+ "header or corrupted image)! (e_shoff = %ld, e_shnum = %d)",
+ static_cast<unsigned long>(elf_header->e_shoff), elf_header->e_shnum);
#else
ALOGE("Invalid image supplied (debug image doesn't contain all the section"
"header or corrupted image)! (e_shoff = %d, e_shnum = %d)",