summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernie Innocenti <codewiz@google.com>2019-03-28 07:48:08 +0100
committerBernie Innocenti <codewiz@google.com>2019-03-28 09:28:13 +0100
commit8bd6f455d261fa62a20321a426723c491903a82e (patch)
tree0864259080dd9934b15435fe4b3500b45485f895
parentMerge "Allow RSA 4096 key in package verification" (diff)
downloadandroid_bootable_recovery-8bd6f455d261fa62a20321a426723c491903a82e.tar
android_bootable_recovery-8bd6f455d261fa62a20321a426723c491903a82e.tar.gz
android_bootable_recovery-8bd6f455d261fa62a20321a426723c491903a82e.tar.bz2
android_bootable_recovery-8bd6f455d261fa62a20321a426723c491903a82e.tar.lz
android_bootable_recovery-8bd6f455d261fa62a20321a426723c491903a82e.tar.xz
android_bootable_recovery-8bd6f455d261fa62a20321a426723c491903a82e.tar.zst
android_bootable_recovery-8bd6f455d261fa62a20321a426723c491903a82e.zip
-rw-r--r--applypatch/applypatch.cpp2
-rw-r--r--fuse_sideload/fuse_sideload.cpp2
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;