Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3da88015 authored by Tao Bao's avatar Tao Bao
Browse files

Replace _exit(-1) with _exit(EXIT_FAILURE). 

-1 is not a valid exit status.

Also replace a few exit(1) with exit(EXIT_FAILURE).

Test: mmma bootable/recovery
Change-Id: I4596c8328b770bf95acccc06a4401bd5cabd4bfd
parent 0f275ae5

adb_install.cpp

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ int apply_from_adb(RecoveryUI* ui, bool* wipe_cache, const char* install_file) { 
    pid_t child;

    if ((child = fork()) == 0) {

        execl("/sbin/recovery", "recovery", "--adbd", NULL);

        _exit(-1);

        _exit(EXIT_FAILURE);

    }



    // FUSE_SIDELOAD_HOST_PATHNAME will start to exist once the host

install.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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

    // copied mutex in the ui functions.

    fprintf(stdout, "E:Can't run %s (%s)\n", chr_args[0], strerror(errno));

    _exit(-1);

    _exit(EXIT_FAILURE);

  }

  close(pipefd[1]);

recovery.cpp

+3 −3
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ static void redirect_stdio(const char* filename) { 
        if (log_fp == nullptr) {

            PLOG(ERROR) << "fopen \"" << filename << "\" failed";

            close(pipefd[0]);

            _exit(1);

            _exit(EXIT_FAILURE);

        }



        FILE* pipe_fp = fdopen(pipefd[0], "r");
@@ -251,7 +251,7 @@ static void redirect_stdio(const char* filename) { 
            PLOG(ERROR) << "fdopen failed";

            check_and_fclose(log_fp, filename);

            close(pipefd[0]);

            _exit(1);

            _exit(EXIT_FAILURE);

        }



        char* line = nullptr;
@@ -273,7 +273,7 @@ static void redirect_stdio(const char* filename) { 
        free(line);

        check_and_fclose(log_fp, filename);

        close(pipefd[0]);

        _exit(1);

        _exit(EXIT_FAILURE);

    } else {

        // Redirect stdout/stderr to the logger process.

        // Close the unused read end.

roots.cpp

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static int exec_cmd(const char* path, char* const argv[]) { 
    pid_t child;

    if ((child = vfork()) == 0) {

        execv(path, argv);

        _exit(-1);

        _exit(EXIT_FAILURE);

    }

    waitpid(child, &status, 0);

    if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) {

updater/blockimg.cpp

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static RangeSet parse_range(const std::string& range_text) { 


err:

  LOG(ERROR) << "failed to parse range '" << range_text << "'";

  exit(1);

  exit(EXIT_FAILURE);

}



static bool range_overlaps(const RangeSet& r1, const RangeSet& r2) {