diff options
| author | Tianjie Xu <xunchang@google.com> | 2018-01-30 22:44:02 +0100 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-01-30 22:44:02 +0100 |
| commit | bded087f7de69fc352c5860659e2db4478b30bdd (patch) | |
| tree | 26ebc8890fcc2fdf5357494abc6bda180249c505 /updater/install.cpp | |
| parent | Merge "Add update_channel field to bootloader_message_ab." (diff) | |
| parent | Avoid overwrite of the error message in AbortFn (diff) | |
| download | android_bootable_recovery-bded087f7de69fc352c5860659e2db4478b30bdd.tar android_bootable_recovery-bded087f7de69fc352c5860659e2db4478b30bdd.tar.gz android_bootable_recovery-bded087f7de69fc352c5860659e2db4478b30bdd.tar.bz2 android_bootable_recovery-bded087f7de69fc352c5860659e2db4478b30bdd.tar.lz android_bootable_recovery-bded087f7de69fc352c5860659e2db4478b30bdd.tar.xz android_bootable_recovery-bded087f7de69fc352c5860659e2db4478b30bdd.tar.zst android_bootable_recovery-bded087f7de69fc352c5860659e2db4478b30bdd.zip | |
Diffstat (limited to 'updater/install.cpp')
| -rw-r--r-- | updater/install.cpp | 12 |
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. |