diff options
author | Chih-hung Hsieh <chh@google.com> | 2016-07-27 22:59:02 +0200 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-27 22:59:02 +0200 |
commit | acc7ebb92a583fd559b47fe297ce3e458cb0bcb2 (patch) | |
tree | 52cd7575ede075f1ebb8999b437fa2ab5c16db22 | |
parent | Import translations. DO NOT MERGE am: e49c0d6406 -s ours (diff) | |
parent | Merge \\\"Fix clang-tidy performance warnings.\\\" am: 2a3b695168 am: 977903da49 (diff) | |
download | android_bootable_recovery-acc7ebb92a583fd559b47fe297ce3e458cb0bcb2.tar android_bootable_recovery-acc7ebb92a583fd559b47fe297ce3e458cb0bcb2.tar.gz android_bootable_recovery-acc7ebb92a583fd559b47fe297ce3e458cb0bcb2.tar.bz2 android_bootable_recovery-acc7ebb92a583fd559b47fe297ce3e458cb0bcb2.tar.lz android_bootable_recovery-acc7ebb92a583fd559b47fe297ce3e458cb0bcb2.tar.xz android_bootable_recovery-acc7ebb92a583fd559b47fe297ce3e458cb0bcb2.tar.zst android_bootable_recovery-acc7ebb92a583fd559b47fe297ce3e458cb0bcb2.zip |
-rw-r--r-- | minui/events.cpp | 2 | ||||
-rw-r--r-- | minui/minui.h | 2 | ||||
-rw-r--r-- | otafault/ota_io.cpp | 2 | ||||
-rw-r--r-- | recovery-refresh.cpp | 2 | ||||
-rw-r--r-- | recovery.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/minui/events.cpp b/minui/events.cpp index a6b9671ed..e6e7bd28c 100644 --- a/minui/events.cpp +++ b/minui/events.cpp @@ -204,7 +204,7 @@ int ev_sync_key_state(ev_set_key_callback set_key_cb, void* data) { return 0; } -void ev_iterate_available_keys(std::function<void(int)> f) { +void ev_iterate_available_keys(const std::function<void(int)>& f) { // Use unsigned long to match ioctl's parameter type. unsigned long ev_bits[BITS_TO_LONGS(EV_MAX)]; // NOLINT unsigned long key_bits[BITS_TO_LONGS(KEY_MAX)]; // NOLINT diff --git a/minui/minui.h b/minui/minui.h index fb0bbe10c..cddfe77f3 100644 --- a/minui/minui.h +++ b/minui/minui.h @@ -67,7 +67,7 @@ typedef int (*ev_set_key_callback)(int code, int value, void* data); int ev_init(ev_callback input_cb, void* data); void ev_exit(); int ev_add_fd(int fd, ev_callback cb, void* data); -void ev_iterate_available_keys(std::function<void(int)> f); +void ev_iterate_available_keys(const std::function<void(int)>& f); int ev_sync_key_state(ev_set_key_callback set_key_cb, void* data); // 'timeout' has the same semantics as poll(2). diff --git a/otafault/ota_io.cpp b/otafault/ota_io.cpp index 94be8155a..2efd3004a 100644 --- a/otafault/ota_io.cpp +++ b/otafault/ota_io.cpp @@ -30,7 +30,7 @@ static std::string read_fault_file_name = ""; static std::string write_fault_file_name = ""; static std::string fsync_fault_file_name = ""; -static bool get_hit_file(const char* cached_path, std::string ffn) { +static bool get_hit_file(const char* cached_path, const std::string& ffn) { return should_hit_cache() ? !strncmp(cached_path, OTAIO_CACHE_FNAME, strlen(cached_path)) : !strncmp(cached_path, ffn.c_str(), strlen(cached_path)); diff --git a/recovery-refresh.cpp b/recovery-refresh.cpp index 333367eba..b75c91538 100644 --- a/recovery-refresh.cpp +++ b/recovery-refresh.cpp @@ -76,7 +76,7 @@ static ssize_t logrotate( } std::string name(filename); - size_t dot = name.find_last_of("."); + size_t dot = name.find_last_of('.'); std::string sub = name.substr(0, dot); if (!strstr(LAST_KMSG_FILE, sub.c_str()) && diff --git a/recovery.cpp b/recovery.cpp index 0c9c1472b..cfca9df6f 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -1446,7 +1446,7 @@ static ssize_t logrotate( } std::string name(filename); - size_t dot = name.find_last_of("."); + size_t dot = name.find_last_of('.'); std::string sub = name.substr(0, dot); if (!strstr(LAST_KMSG_FILE, sub.c_str()) && |