summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-03-24 21:34:27 +0100
committerandroid-build-merger <android-build-merger@google.com>2017-03-24 21:34:27 +0100
commit6b3df6486e4e3d79802e38b99d9d2057df0fc7c7 (patch)
tree577df1cb0fa236caa5489f10c803f8ee2c99f3ac
parentMerge "Fix the wrong parameter when calling read_metadata_from_package()." am: 6014db5da6 (diff)
parentMerge "Removed C-style casts" (diff)
downloadandroid_bootable_recovery-6b3df6486e4e3d79802e38b99d9d2057df0fc7c7.tar
android_bootable_recovery-6b3df6486e4e3d79802e38b99d9d2057df0fc7c7.tar.gz
android_bootable_recovery-6b3df6486e4e3d79802e38b99d9d2057df0fc7c7.tar.bz2
android_bootable_recovery-6b3df6486e4e3d79802e38b99d9d2057df0fc7c7.tar.lz
android_bootable_recovery-6b3df6486e4e3d79802e38b99d9d2057df0fc7c7.tar.xz
android_bootable_recovery-6b3df6486e4e3d79802e38b99d9d2057df0fc7c7.tar.zst
android_bootable_recovery-6b3df6486e4e3d79802e38b99d9d2057df0fc7c7.zip
-rw-r--r--ui.cpp2
-rw-r--r--updater/blockimg.cpp2
-rw-r--r--wear_touch.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/ui.cpp b/ui.cpp
index a796461c8..9194ae3df 100644
--- a/ui.cpp
+++ b/ui.cpp
@@ -240,7 +240,7 @@ void RecoveryUI::ProcessKey(int key_code, int updown) {
}
void* RecoveryUI::time_key_helper(void* cookie) {
- key_timer_t* info = (key_timer_t*) cookie;
+ key_timer_t* info = static_cast<key_timer_t*>(cookie);
info->ui->time_key(info->key_code, info->count);
delete info;
return nullptr;
diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp
index 12ca151a1..db5fcc87c 100644
--- a/updater/blockimg.cpp
+++ b/updater/blockimg.cpp
@@ -356,7 +356,7 @@ static bool receive_new_data(const uint8_t* data, size_t size, void* cookie) {
}
static void* unzip_new_data(void* cookie) {
- NewThreadInfo* nti = (NewThreadInfo*) cookie;
+ NewThreadInfo* nti = static_cast<NewThreadInfo*>(cookie);
ProcessZipEntryContents(nti->za, &nti->entry, receive_new_data, nti);
return nullptr;
}
diff --git a/wear_touch.cpp b/wear_touch.cpp
index cf33daa9f..e2ab44d2d 100644
--- a/wear_touch.cpp
+++ b/wear_touch.cpp
@@ -118,7 +118,7 @@ void WearSwipeDetector::run() {
}
void* WearSwipeDetector::touch_thread(void* cookie) {
- ((WearSwipeDetector*)cookie)->run();
+ (static_cast<WearSwipeDetector*>(cookie))->run();
return NULL;
}