Merge "Factor out option variables from int to bool types"
diff --git a/adb_install.cpp b/adb_install.cpp
index e328960..6d6dbb1 100644
--- a/adb_install.cpp
+++ b/adb_install.cpp
@@ -73,7 +73,7 @@
#define ADB_INSTALL_TIMEOUT 300
int
-apply_from_adb(RecoveryUI* ui_, int* wipe_cache, const char* install_file) {
+apply_from_adb(RecoveryUI* ui_, bool* wipe_cache, const char* install_file) {
ui = ui_;
stop_adbd();
diff --git a/adb_install.h b/adb_install.h
index a18b712..efad436 100644
--- a/adb_install.h
+++ b/adb_install.h
@@ -19,6 +19,6 @@
class RecoveryUI;
-int apply_from_adb(RecoveryUI* h, int* wipe_cache, const char* install_file);
+int apply_from_adb(RecoveryUI* h, bool* wipe_cache, const char* install_file);
#endif
diff --git a/install.cpp b/install.cpp
index 31606bb..63b1d38 100644
--- a/install.cpp
+++ b/install.cpp
@@ -48,7 +48,7 @@
// 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 @@
}
close(pipefd[1]);
- *wipe_cache = 0;
+ *wipe_cache = false;
char buffer[1024];
FILE* from_child = fdopen(pipefd[0], "r");
@@ -158,7 +158,7 @@
}
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 @@
}
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 @@
}
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");
diff --git a/install.h b/install.h
index 53c0d31..680499d 100644
--- a/install.h
+++ b/install.h
@@ -27,7 +27,7 @@
// Install the package specified by root_path. If INSTALL_SUCCESS is
// returned and *wipe_cache is true on exit, caller should wipe the
// cache partition.
-int install_package(const char *root_path, int* wipe_cache,
+int install_package(const char* root_path, bool* wipe_cache,
const char* install_file, bool needs_mount);
#ifdef __cplusplus
diff --git a/recovery.cpp b/recovery.cpp
index 51c131d..d27f527 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -825,7 +825,7 @@
}
}
-static int apply_from_sdcard(Device* device, int* wipe_cache) {
+static int apply_from_sdcard(Device* device, bool* wipe_cache) {
if (ensure_path_mounted(SDCARD_ROOT) != 0) {
ui->Print("\n-- Couldn't mount %s.\n", SDCARD_ROOT);
return INSTALL_ERROR;
@@ -878,7 +878,7 @@
// statement below.
Device::BuiltinAction chosen_action = device->InvokeMenuItem(chosen_item);
- int wipe_cache = 0;
+ bool wipe_cache = false;
switch (chosen_action) {
case Device::NO_ACTION:
break;
@@ -1010,7 +1010,9 @@
const char *send_intent = NULL;
const char *update_package = NULL;
- int wipe_data = 0, wipe_cache = 0, show_text = 0;
+ bool wipe_data = false;
+ bool wipe_cache = false;
+ bool show_text = false;
bool just_exit = false;
bool shutdown_after = false;
@@ -1019,9 +1021,9 @@
switch (arg) {
case 's': send_intent = optarg; break;
case 'u': update_package = optarg; break;
- case 'w': wipe_data = wipe_cache = 1; break;
- case 'c': wipe_cache = 1; break;
- case 't': show_text = 1; break;
+ case 'w': wipe_data = wipe_cache = true; break;
+ case 'c': wipe_cache = true; break;
+ case 't': show_text = true; break;
case 'x': just_exit = true; break;
case 'l': locale = optarg; break;
case 'g': {