diff options
author | Tianjie Xu <xunchang@google.com> | 2017-07-27 20:42:17 +0200 |
---|---|---|
committer | Tianjie Xu <xunchang@google.com> | 2017-07-27 23:28:18 +0200 |
commit | 8b8e23d5cc38d4f9139b3b3cdca4a9c5ec51139e (patch) | |
tree | 12d15e93e6c1a3c3440573b225c942ae9a7cae28 /uncrypt | |
parent | Merge "Remove LOCAL_CLANG" (diff) | |
download | android_bootable_recovery-8b8e23d5cc38d4f9139b3b3cdca4a9c5ec51139e.tar android_bootable_recovery-8b8e23d5cc38d4f9139b3b3cdca4a9c5ec51139e.tar.gz android_bootable_recovery-8b8e23d5cc38d4f9139b3b3cdca4a9c5ec51139e.tar.bz2 android_bootable_recovery-8b8e23d5cc38d4f9139b3b3cdca4a9c5ec51139e.tar.lz android_bootable_recovery-8b8e23d5cc38d4f9139b3b3cdca4a9c5ec51139e.tar.xz android_bootable_recovery-8b8e23d5cc38d4f9139b3b3cdca4a9c5ec51139e.tar.zst android_bootable_recovery-8b8e23d5cc38d4f9139b3b3cdca4a9c5ec51139e.zip |
Diffstat (limited to '')
-rw-r--r-- | uncrypt/uncrypt.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/uncrypt/uncrypt.cpp b/uncrypt/uncrypt.cpp index 07d183be2..35998bcba 100644 --- a/uncrypt/uncrypt.cpp +++ b/uncrypt/uncrypt.cpp @@ -448,20 +448,20 @@ static int produce_block_map(const char* path, const char* map_file, const char* static int uncrypt(const char* input_path, const char* map_file, const int socket) { LOG(INFO) << "update package is \"" << input_path << "\""; - // Turn the name of the file we're supposed to convert into an - // absolute path, so we can find what filesystem it's on. + // Turn the name of the file we're supposed to convert into an absolute path, so we can find + // what filesystem it's on. char path[PATH_MAX+1]; - if (realpath(input_path, path) == NULL) { + if (realpath(input_path, path) == nullptr) { PLOG(ERROR) << "failed to convert \"" << input_path << "\" to absolute path"; - return 1; + return kUncryptRealpathFindError; } bool encryptable; bool encrypted; const char* blk_dev = find_block_device(path, &encryptable, &encrypted); - if (blk_dev == NULL) { + if (blk_dev == nullptr) { LOG(ERROR) << "failed to find block device for " << path; - return 1; + return kUncryptBlockDeviceFindError; } // If the filesystem it's on isn't encrypted, we only produce the |