summaryrefslogtreecommitdiffstats
path: root/updater/install.cpp
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2018-01-30 23:02:50 +0100
committerandroid-build-merger <android-build-merger@google.com>2018-01-30 23:02:50 +0100
commit39b6c7fcfecbc226cda1c8f132a61cae78ca82be (patch)
tree35b7434921fbeee94c26bdf4fff32dcbb2ac05a8 /updater/install.cpp
parentMerge "Add update_channel field to bootloader_message_ab." am: 63eb1a4444 (diff)
parentMerge "Avoid overwrite of the error message in AbortFn" (diff)
downloadandroid_bootable_recovery-39b6c7fcfecbc226cda1c8f132a61cae78ca82be.tar
android_bootable_recovery-39b6c7fcfecbc226cda1c8f132a61cae78ca82be.tar.gz
android_bootable_recovery-39b6c7fcfecbc226cda1c8f132a61cae78ca82be.tar.bz2
android_bootable_recovery-39b6c7fcfecbc226cda1c8f132a61cae78ca82be.tar.lz
android_bootable_recovery-39b6c7fcfecbc226cda1c8f132a61cae78ca82be.tar.xz
android_bootable_recovery-39b6c7fcfecbc226cda1c8f132a61cae78ca82be.tar.zst
android_bootable_recovery-39b6c7fcfecbc226cda1c8f132a61cae78ca82be.zip
Diffstat (limited to 'updater/install.cpp')
-rw-r--r--updater/install.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/updater/install.cpp b/updater/install.cpp
index b83d30ff3..eef252e30 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -268,7 +268,7 @@ Value* FormatFn(const char* name, State* state, const std::vector<std::unique_pt
int64_t size;
if (!android::base::ParseInt(fs_size, &size)) {
- return ErrorAbort(state, kArgsParsingFailure, "%s: failed to parse int in %s\n", name,
+ return ErrorAbort(state, kArgsParsingFailure, "%s: failed to parse int in %s", name,
fs_size.c_str());
}
@@ -352,12 +352,12 @@ Value* ShowProgressFn(const char* name, State* state,
double frac;
if (!android::base::ParseDouble(frac_str.c_str(), &frac)) {
- return ErrorAbort(state, kArgsParsingFailure, "%s: failed to parse double in %s\n", name,
+ return ErrorAbort(state, kArgsParsingFailure, "%s: failed to parse double in %s", name,
frac_str.c_str());
}
int sec;
if (!android::base::ParseInt(sec_str.c_str(), &sec)) {
- return ErrorAbort(state, kArgsParsingFailure, "%s: failed to parse int in %s\n", name,
+ return ErrorAbort(state, kArgsParsingFailure, "%s: failed to parse int in %s", name,
sec_str.c_str());
}
@@ -380,7 +380,7 @@ Value* SetProgressFn(const char* name, State* state, const std::vector<std::uniq
double frac;
if (!android::base::ParseDouble(frac_str.c_str(), &frac)) {
- return ErrorAbort(state, kArgsParsingFailure, "%s: failed to parse double in %s\n", name,
+ return ErrorAbort(state, kArgsParsingFailure, "%s: failed to parse double in %s", name,
frac_str.c_str());
}
@@ -574,8 +574,8 @@ Value* ApplyPatchSpaceFn(const char* name, State* state, const std::vector<std::
size_t bytes;
if (!android::base::ParseUint(bytes_str.c_str(), &bytes)) {
- return ErrorAbort(state, kArgsParsingFailure, "%s(): can't parse \"%s\" as byte count\n\n",
- name, bytes_str.c_str());
+ return ErrorAbort(state, kArgsParsingFailure, "%s(): can't parse \"%s\" as byte count", name,
+ bytes_str.c_str());
}
// Skip the cache size check if the update is a retry.