summaryrefslogtreecommitdiffstats
path: root/updater
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-02-04 00:53:26 +0100
committerandroid-build-merger <android-build-merger@google.com>2017-02-04 00:53:26 +0100
commit94720ced1a42fac53ebb4ca028719bd7251dc863 (patch)
treeeb7876bf60c6c00b29aaa30c6679642907b39032 /updater
parentMerge "Avoid to call UI functions in child process" am: 0f275ae56e am: 5fa2e576f9 am: 15ab95bb63 (diff)
parentMerge "Replace _exit(-1) with _exit(EXIT_FAILURE)." am: 95bcbfdd4e am: 80176c68b2 (diff)
downloadandroid_bootable_recovery-94720ced1a42fac53ebb4ca028719bd7251dc863.tar
android_bootable_recovery-94720ced1a42fac53ebb4ca028719bd7251dc863.tar.gz
android_bootable_recovery-94720ced1a42fac53ebb4ca028719bd7251dc863.tar.bz2
android_bootable_recovery-94720ced1a42fac53ebb4ca028719bd7251dc863.tar.lz
android_bootable_recovery-94720ced1a42fac53ebb4ca028719bd7251dc863.tar.xz
android_bootable_recovery-94720ced1a42fac53ebb4ca028719bd7251dc863.tar.zst
android_bootable_recovery-94720ced1a42fac53ebb4ca028719bd7251dc863.zip
Diffstat (limited to 'updater')
-rw-r--r--updater/blockimg.cpp2
-rw-r--r--updater/install.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp
index 6755d78cb..03ce4136e 100644
--- a/updater/blockimg.cpp
+++ b/updater/blockimg.cpp
@@ -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) {
diff --git a/updater/install.cpp b/updater/install.cpp
index 7a8e92f6c..c7ecdb5c7 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -247,7 +247,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);
}
int status;
@@ -1072,7 +1072,7 @@ Value* RunProgramFn(const char* name, State* state, int argc, Expr* argv[]) {
if (child == 0) {
execv(args2[0], args2);
PLOG(ERROR) << "run_program: execv failed";
- _exit(1);
+ _exit(EXIT_FAILURE);
}
int status;