diff options
| author | Bernie Innocenti <codewiz@google.com> | 2019-03-29 05:08:33 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-29 05:08:33 +0100 |
| commit | 7367caad0f526b102d1d20bac743a6ce133fa87a (patch) | |
| tree | 385629afcd38f624cd8af6c2741aba0e9756b704 | |
| parent | Merge "Remove the extern declaration of `sehandle` from roots.cpp." (diff) | |
| parent | Merge "Fix bogus error checking on unique_fd" (diff) | |
| download | android_bootable_recovery-7367caad0f526b102d1d20bac743a6ce133fa87a.tar android_bootable_recovery-7367caad0f526b102d1d20bac743a6ce133fa87a.tar.gz android_bootable_recovery-7367caad0f526b102d1d20bac743a6ce133fa87a.tar.bz2 android_bootable_recovery-7367caad0f526b102d1d20bac743a6ce133fa87a.tar.lz android_bootable_recovery-7367caad0f526b102d1d20bac743a6ce133fa87a.tar.xz android_bootable_recovery-7367caad0f526b102d1d20bac743a6ce133fa87a.tar.zst android_bootable_recovery-7367caad0f526b102d1d20bac743a6ce133fa87a.zip | |
| -rw-r--r-- | applypatch/applypatch.cpp | 2 | ||||
| -rw-r--r-- | fuse_sideload/fuse_sideload.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/applypatch/applypatch.cpp b/applypatch/applypatch.cpp index f9383ddeb..90d8e8604 100644 --- a/applypatch/applypatch.cpp +++ b/applypatch/applypatch.cpp @@ -76,7 +76,7 @@ static bool ReadPartitionToBuffer(const Partition& partition, FileContents* out, } android::base::unique_fd dev(open(partition.name.c_str(), O_RDONLY)); - if (!dev) { + if (dev == -1) { PLOG(ERROR) << "Failed to open eMMC partition \"" << partition << "\""; } else { std::vector<unsigned char> buffer(partition.size); diff --git a/fuse_sideload/fuse_sideload.cpp b/fuse_sideload/fuse_sideload.cpp index b5b6ac15e..3d9480309 100644 --- a/fuse_sideload/fuse_sideload.cpp +++ b/fuse_sideload/fuse_sideload.cpp @@ -392,7 +392,7 @@ int run_fuse_sideload(std::unique_ptr<FuseDataProvider>&& provider, const char* } fd.ffd.reset(open("/dev/fuse", O_RDWR)); - if (!fd.ffd) { + if (fd.ffd == -1) { perror("open /dev/fuse"); result = -1; goto done; |