tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 43b80810: Merge "Factor out option variables from int to bool types"

Browse source 
* commit '43b80810284bd0eb43a4488044f902c910c9f3b2':
  Factor out option variables from int to bool types
This commit is contained in:
Tao Bao 2015-03-26 03:47:02 +00:00 committed by Android Git Automerger
commit dfe34afed6
5 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
adb_install.cpp
View file

@ -73,7 +73,7 @@ maybe_restart_adbd() {
#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();

2
adb_install.h
View file

@ -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

10
install.cpp
View file

@ -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");

2
install.h
View file

@ -27,7 +27,7 @@ enum { INSTALL_SUCCESS, INSTALL_ERROR, INSTALL_CORRUPT, INSTALL_NONE };
// 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

14
recovery.cpp
View file

@ -825,7 +825,7 @@ static void choose_recovery_file(Device* device) {
}
}
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 @@ prompt_and_wait(Device* device, int status) {
// 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 @@ main(int argc, char **argv) {
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 @@ main(int argc, char **argv) {
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': {