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

Merge "Replace _exit(-1) with _exit(EXIT_FAILURE)." am: 95bcbfdd4e

Browse source 
am: 80176c68b2

Change-Id: I6338fc4f929b0887563a0194719c887131538fec
This commit is contained in:
Tao Bao 2017-02-03 23:48:27 +00:00 committed by android-build-merger
commit b8af1beed0
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
adb_install.cpp
View file

@ -78,7 +78,7 @@ int apply_from_adb(RecoveryUI* ui, bool* wipe_cache, const char* install_file) {
pid_t child; pid_t child;
if ((child = fork()) == 0) { if ((child = fork()) == 0) {
execl("/sbin/recovery", "recovery", "--adbd", NULL); execl("/sbin/recovery", "recovery", "--adbd", NULL);
_exit(-1); _exit(EXIT_FAILURE);
} }
// FUSE_SIDELOAD_HOST_PATHNAME will start to exist once the host // FUSE_SIDELOAD_HOST_PATHNAME will start to exist once the host

2
install.cpp
View file

@ -387,7 +387,7 @@ static int try_update_binary(const char* path, ZipArchiveHandle zip, bool* wipe_
// the child process to hang. This deadlock results from an improperly // the child process to hang. This deadlock results from an improperly
// copied mutex in the ui functions. // copied mutex in the ui functions.
fprintf(stdout, "E:Can't run %s (%s)\n", chr_args[0], strerror(errno)); fprintf(stdout, "E:Can't run %s (%s)\n", chr_args[0], strerror(errno));
_exit(-1); _exit(EXIT_FAILURE);
} }
close(pipefd[1]); close(pipefd[1]);

6
recovery.cpp
View file

@ -243,7 +243,7 @@ static void redirect_stdio(const char* filename) {
if (log_fp == nullptr) { if (log_fp == nullptr) {
PLOG(ERROR) << "fopen \"" << filename << "\" failed"; PLOG(ERROR) << "fopen \"" << filename << "\" failed";
close(pipefd[0]); close(pipefd[0]);
_exit(1); _exit(EXIT_FAILURE);
} }
FILE* pipe_fp = fdopen(pipefd[0], "r"); FILE* pipe_fp = fdopen(pipefd[0], "r");
@ -251,7 +251,7 @@ static void redirect_stdio(const char* filename) {
PLOG(ERROR) << "fdopen failed"; PLOG(ERROR) << "fdopen failed";
check_and_fclose(log_fp, filename); check_and_fclose(log_fp, filename);
close(pipefd[0]); close(pipefd[0]);
_exit(1); _exit(EXIT_FAILURE);
} }
char* line = nullptr; char* line = nullptr;
@ -273,7 +273,7 @@ static void redirect_stdio(const char* filename) {
free(line); free(line);
check_and_fclose(log_fp, filename); check_and_fclose(log_fp, filename);
close(pipefd[0]); close(pipefd[0]);
_exit(1); _exit(EXIT_FAILURE);
} else { } else {
// Redirect stdout/stderr to the logger process. // Redirect stdout/stderr to the logger process.
// Close the unused read end. // Close the unused read end.

2
roots.cpp
View file

@ -163,7 +163,7 @@ static int exec_cmd(const char* path, char* const argv[]) {
pid_t child; pid_t child;
if ((child = vfork()) == 0) { if ((child = vfork()) == 0) {
execv(path, argv); execv(path, argv);
_exit(-1); _exit(EXIT_FAILURE);
} }
waitpid(child, &status, 0); waitpid(child, &status, 0);
if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) { if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {

2
updater/blockimg.cpp
View file

@ -120,7 +120,7 @@ static RangeSet parse_range(const std::string& range_text) {
err: err:
LOG(ERROR) << "failed to parse range '" << range_text << "'"; LOG(ERROR) << "failed to parse range '" << range_text << "'";
exit(1); exit(EXIT_FAILURE);
} }
static bool range_overlaps(const RangeSet& r1, const RangeSet& r2) { static bool range_overlaps(const RangeSet& r1, const RangeSet& r2) {

4
updater/install.cpp
View file

@ -247,7 +247,7 @@ static int exec_cmd(const char* path, char* const argv[]) {
pid_t child; pid_t child;
if ((child = vfork()) == 0) { if ((child = vfork()) == 0) {
execv(path, argv); execv(path, argv);
_exit(-1); _exit(EXIT_FAILURE);
} }
int status; int status;
@ -1072,7 +1072,7 @@ Value* RunProgramFn(const char* name, State* state, int argc, Expr* argv[]) {
if (child == 0) { if (child == 0) {
execv(args2[0], args2); execv(args2[0], args2);
PLOG(ERROR) << "run_program: execv failed"; PLOG(ERROR) << "run_program: execv failed";
_exit(1); _exit(EXIT_FAILURE);
} }
int status; int status;