Merge "Fix clang-tidy warnings in bootable/recovery."

This commit is contained in:
Treehugger Robot 2016-08-26 23:29:23 +00:00 committed by Gerrit Code Review
commit 89bf2bdc85
3 changed files with 4 additions and 4 deletions

View file

@ -54,8 +54,8 @@ static const float DEFAULT_FILES_PROGRESS_FRACTION = 0.4;
static const float DEFAULT_IMAGE_PROGRESS_FRACTION = 0.1;
// This function parses and returns the build.version.incremental
static int parse_build_number(std::string str) {
size_t pos = str.find("=");
static int parse_build_number(const std::string& str) {
size_t pos = str.find('=');
if (pos != std::string::npos) {
std::string num_string = android::base::Trim(str.substr(pos+1));
int build_number;

View file

@ -65,7 +65,7 @@ static bool file_cmp(std::string& f1, std::string& f2) {
return c1 == c2;
}
static std::string from_testdata_base(const std::string fname) {
static std::string from_testdata_base(const std::string& fname) {
return android::base::StringPrintf("%s%s%s/%s",
&DATA_PATH[0],
&NATIVE_TEST_PATH[0],

View file

@ -122,7 +122,7 @@ void* WearSwipeDetector::touch_thread(void* cookie) {
return NULL;
}
#define test_bit(bit, array) (array[bit/8] & (1<<(bit%8)))
#define test_bit(bit, array) ((array)[(bit)/8] & (1<<((bit)%8)))
int WearSwipeDetector::openDevice(const char *device) {
int fd = open(device, O_RDONLY);