diff options
author | Tianjie Xu <xunchang@google.com> | 2019-03-29 22:23:49 +0100 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-03-29 22:23:49 +0100 |
commit | a232d9dccbf39856824ad783cc2d66812f581d95 (patch) | |
tree | 7bad452d0d5b0ae6eca9adf18c7bf8b8966a318f /otautil/roots.cpp | |
parent | Merge "Use flags = 0 to avoid fd closing for child updater process" (diff) | |
parent | Move install to separate module (diff) | |
download | android_bootable_recovery-a232d9dccbf39856824ad783cc2d66812f581d95.tar android_bootable_recovery-a232d9dccbf39856824ad783cc2d66812f581d95.tar.gz android_bootable_recovery-a232d9dccbf39856824ad783cc2d66812f581d95.tar.bz2 android_bootable_recovery-a232d9dccbf39856824ad783cc2d66812f581d95.tar.lz android_bootable_recovery-a232d9dccbf39856824ad783cc2d66812f581d95.tar.xz android_bootable_recovery-a232d9dccbf39856824ad783cc2d66812f581d95.tar.zst android_bootable_recovery-a232d9dccbf39856824ad783cc2d66812f581d95.zip |
Diffstat (limited to '')
-rw-r--r-- | otautil/roots.cpp (renamed from roots.cpp) | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/roots.cpp b/otautil/roots.cpp index c42723f0c..815d644e5 100644 --- a/roots.cpp +++ b/otautil/roots.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "roots.h" +#include "otautil/roots.h" #include <ctype.h> #include <fcntl.h> @@ -174,11 +174,9 @@ int format_volume(const std::string& volume, const std::string& directory) { PLOG(ERROR) << "format_volume: failed to open " << v->blk_device; return -1; } - length = - get_file_size(fd.get(), v->length ? -v->length : CRYPT_FOOTER_OFFSET); + length = get_file_size(fd.get(), v->length ? -v->length : CRYPT_FOOTER_OFFSET); if (length <= 0) { - LOG(ERROR) << "get_file_size: invalid size " << length << " for " - << v->blk_device; + LOG(ERROR) << "get_file_size: invalid size " << length << " for " << v->blk_device; return -1; } } |