diff options
author | Tao Bao <tbao@google.com> | 2015-03-26 04:47:02 +0100 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-26 04:47:02 +0100 |
commit | dfe34afed681692aa9a8703d5c2a8add0f345c8d (patch) | |
tree | 3bdeff295f050e159b2392b557c67788e8272b00 /install.cpp | |
parent | am e31f9565: Merge "Remove support for Cupcake kernels." (diff) | |
parent | Merge "Factor out option variables from int to bool types" (diff) | |
download | android_bootable_recovery-dfe34afed681692aa9a8703d5c2a8add0f345c8d.tar android_bootable_recovery-dfe34afed681692aa9a8703d5c2a8add0f345c8d.tar.gz android_bootable_recovery-dfe34afed681692aa9a8703d5c2a8add0f345c8d.tar.bz2 android_bootable_recovery-dfe34afed681692aa9a8703d5c2a8add0f345c8d.tar.lz android_bootable_recovery-dfe34afed681692aa9a8703d5c2a8add0f345c8d.tar.xz android_bootable_recovery-dfe34afed681692aa9a8703d5c2a8add0f345c8d.tar.zst android_bootable_recovery-dfe34afed681692aa9a8703d5c2a8add0f345c8d.zip |
Diffstat (limited to 'install.cpp')
-rw-r--r-- | install.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/install.cpp b/install.cpp index 31606bb1a..63b1d38c3 100644 --- a/install.cpp +++ b/install.cpp @@ -48,7 +48,7 @@ static const float DEFAULT_IMAGE_PROGRESS_FRACTION = 0.1; // If the package contains an update binary, extract it and run it. static int -try_update_binary(const char *path, ZipArchive *zip, int* wipe_cache) { +try_update_binary(const char* path, ZipArchive* zip, bool* wipe_cache) { const ZipEntry* binary_entry = mzFindZipEntry(zip, ASSUMED_UPDATE_BINARY_NAME); if (binary_entry == NULL) { @@ -129,7 +129,7 @@ try_update_binary(const char *path, ZipArchive *zip, int* wipe_cache) { } close(pipefd[1]); - *wipe_cache = 0; + *wipe_cache = false; char buffer[1024]; FILE* from_child = fdopen(pipefd[0], "r"); @@ -158,7 +158,7 @@ try_update_binary(const char *path, ZipArchive *zip, int* wipe_cache) { } fflush(stdout); } else if (strcmp(command, "wipe_cache") == 0) { - *wipe_cache = 1; + *wipe_cache = true; } else if (strcmp(command, "clear_display") == 0) { ui->SetBackground(RecoveryUI::NONE); } else if (strcmp(command, "enable_reboot") == 0) { @@ -183,7 +183,7 @@ try_update_binary(const char *path, ZipArchive *zip, int* wipe_cache) { } static int -really_install_package(const char *path, int* wipe_cache, bool needs_mount) +really_install_package(const char *path, bool* wipe_cache, bool needs_mount) { ui->SetBackground(RecoveryUI::INSTALLING_UPDATE); ui->Print("Finding update package...\n"); @@ -253,7 +253,7 @@ really_install_package(const char *path, int* wipe_cache, bool needs_mount) } int -install_package(const char* path, int* wipe_cache, const char* install_file, +install_package(const char* path, bool* wipe_cache, const char* install_file, bool needs_mount) { FILE* install_log = fopen_path(install_file, "w"); |