Fix potential lint errors
Bug: 200914293
Test: m cpplint-art (using tools/repo-hooks/tools/cpplint.py)
Test: treehugger
Change-Id: I8ec57527ad7ce94b26c4f65727f536a5ebbbd6aa
diff --git a/dex2oat/common_compiler_driver_test.cc b/dex2oat/common_compiler_driver_test.cc
index 2007c5a..7e71976 100644
--- a/dex2oat/common_compiler_driver_test.cc
+++ b/dex2oat/common_compiler_driver_test.cc
@@ -67,7 +67,7 @@
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 1d1eab8..d10ed26 100644
--- a/dexdump/dexdump.cc
+++ b/dexdump/dexdump.cc
@@ -1367,7 +1367,7 @@
}
}
- bail:
+bail:
free(typeDescriptor);
free(accessStr);
}
diff --git a/dexlayout/dexlayout.cc b/dexlayout/dexlayout.cc
index 91e99fd..a50e729 100644
--- a/dexlayout/dexlayout.cc
+++ b/dexlayout/dexlayout.cc
@@ -1272,7 +1272,7 @@
}
}
- bail:
+bail:
free(type_descriptor);
free(access_str);
}
diff --git a/tools/dmtracedump/tracedump.cc b/tools/dmtracedump/tracedump.cc
index 42527c5..3cb7374 100644
--- a/tools/dmtracedump/tracedump.cc
+++ b/tools/dmtracedump/tracedump.cc
@@ -849,7 +849,7 @@
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;