diff options
author | Tao Bao <tbao@google.com> | 2017-03-24 21:32:29 +0100 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-03-24 21:32:29 +0100 |
commit | 6a831e02b67776c2600d7069a77fef0211432cb9 (patch) | |
tree | 577df1cb0fa236caa5489f10c803f8ee2c99f3ac | |
parent | Merge "Fix the wrong parameter when calling read_metadata_from_package()." (diff) | |
parent | Merge "Removed C-style casts" (diff) | |
download | android_bootable_recovery-6a831e02b67776c2600d7069a77fef0211432cb9.tar android_bootable_recovery-6a831e02b67776c2600d7069a77fef0211432cb9.tar.gz android_bootable_recovery-6a831e02b67776c2600d7069a77fef0211432cb9.tar.bz2 android_bootable_recovery-6a831e02b67776c2600d7069a77fef0211432cb9.tar.lz android_bootable_recovery-6a831e02b67776c2600d7069a77fef0211432cb9.tar.xz android_bootable_recovery-6a831e02b67776c2600d7069a77fef0211432cb9.tar.zst android_bootable_recovery-6a831e02b67776c2600d7069a77fef0211432cb9.zip |
-rw-r--r-- | ui.cpp | 2 | ||||
-rw-r--r-- | updater/blockimg.cpp | 2 | ||||
-rw-r--r-- | wear_touch.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -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; } |