commit a0fe1227b834410c8ae12159bceaaa7e76bec308
author Treehugger Robot <treehugger-gerrit@google.com> Fri Mar 29 03:52:46 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 29 03:52:46 2019 +0000
tree 385629afcd38f624cd8af6c2741aba0e9756b704
parent 047582b5066afc3db0df2e38c0065ecef87a585d
parent 8bd6f455d261fa62a20321a426723c491903a82e

Merge "Fix bogus error checking on unique_fd"

applypatch/applypatch.cpp

diff --git a/applypatch/applypatch.cpp b/applypatch/applypatch.cpp
index f9383dd..90d8e86 100644
--- a/applypatch/applypatch.cpp
+++ b/applypatch/applypatch.cpp
@@ -76,7 +76,7 @@
   }
 
   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);

fuse_sideload/fuse_sideload.cpp

diff --git a/fuse_sideload/fuse_sideload.cpp b/fuse_sideload/fuse_sideload.cpp
index b5b6ac1..3d94803 100644
--- a/fuse_sideload/fuse_sideload.cpp
+++ b/fuse_sideload/fuse_sideload.cpp
@@ -392,7 +392,7 @@
   }
 
   fd.ffd.reset(open("/dev/fuse", O_RDWR));
-  if (!fd.ffd) {
+  if (fd.ffd == -1) {
     perror("open /dev/fuse");
     result = -1;
     goto done;