summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Orion Hodson <oth@google.com> 2021-11-10 19:48:08 +0000
committer Orion Hodson <oth@google.com> 2021-11-11 21:37:16 +0000
commit219f81f52477d22ad9618e111b356193bce616de (patch)
tree6b05fc2b748db3eba21ac65e16a2475cf6c6b924
parentcb8f8c12872d36304dbac80fbd08d8400a757fe5 (diff)
Fix potential lint errors
Bug: 200914293 Test: m cpplint-art (using tools/repo-hooks/tools/cpplint.py) Test: treehugger Change-Id: I8ec57527ad7ce94b26c4f65727f536a5ebbbd6aa
-rw-r--r--dex2oat/common_compiler_driver_test.cc2
-rw-r--r--dexdump/dexdump.cc2
-rw-r--r--dexlayout/dexlayout.cc2
-rw-r--r--tools/dmtracedump/tracedump.cc2
4 files changed, 4 insertions, 4 deletions
diff --git a/dex2oat/common_compiler_driver_test.cc b/dex2oat/common_compiler_driver_test.cc
index 2007c5a970..7e71976729 100644
--- a/dex2oat/common_compiler_driver_test.cc
+++ b/dex2oat/common_compiler_driver_test.cc
@@ -67,7 +67,7 @@ void CommonCompilerDriverTest::ReserveImageSpace() {
MemMap::Init();
image_reservation_ = MemMap::MapAnonymous("image reservation",
reinterpret_cast<uint8_t*>(ART_BASE_ADDRESS),
- (size_t)120 * 1024 * 1024, // 120MB
+ static_cast<size_t>(120 * 1024 * 1024), // 120MB
PROT_NONE,
false /* no need for 4gb flag with fixed mmap */,
/*reuse=*/ false,
diff --git a/dexdump/dexdump.cc b/dexdump/dexdump.cc
index 1d1eab8f01..d10ed26f84 100644
--- a/dexdump/dexdump.cc
+++ b/dexdump/dexdump.cc
@@ -1367,7 +1367,7 @@ static void dumpMethod(const ClassAccessor::Method& method, int i) {
}
}
- bail:
+bail:
free(typeDescriptor);
free(accessStr);
}
diff --git a/dexlayout/dexlayout.cc b/dexlayout/dexlayout.cc
index 91e99fd053..a50e729b5d 100644
--- a/dexlayout/dexlayout.cc
+++ b/dexlayout/dexlayout.cc
@@ -1272,7 +1272,7 @@ void DexLayout::DumpMethod(uint32_t idx,
}
}
- bail:
+bail:
free(type_descriptor);
free(access_str);
}
diff --git a/tools/dmtracedump/tracedump.cc b/tools/dmtracedump/tracedump.cc
index 42527c5699..3cb737474f 100644
--- a/tools/dmtracedump/tracedump.cc
+++ b/tools/dmtracedump/tracedump.cc
@@ -849,7 +849,7 @@ DataKeys* parseKeys(FILE* fp, int32_t verbose) {
return nullptr;
}
- if (fread(pKeys->fileData, 1, pKeys->fileLen, fp) != (size_t)pKeys->fileLen) {
+ if (fread(pKeys->fileData, 1, pKeys->fileLen, fp) != static_cast<size_t>(pKeys->fileLen)) {
fprintf(stderr, "ERROR: unable to read %" PRIu64 " bytes from trace file\n", pKeys->fileLen);
freeDataKeys(pKeys);
return nullptr;