PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bogus error checking on unique_fd"

Browse Source 
am: a0fe1227b8

Change-Id: I90f7429cf22cd2a400054a9b3eed4fc4d79436a6
This commit is contained in:
Bernie Innocenti
2019-03-28 21:08:33 -07:00
committed by android-build-merger
parent 9e23616e2e a0fe1227b8
commit 7367caad0f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applypatch/applypatch.cpp
+1 -1
View File
@@ -76,7 +76,7 @@ static bool ReadPartitionToBuffer(const Partition& partition, FileContents* out,
} }
android::base::unique_fd dev(open(partition.name.c_str(), O_RDONLY)); 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 << "\""; PLOG(ERROR) << "Failed to open eMMC partition \"" << partition << "\"";
} else { } else {
std::vector<unsigned char> buffer(partition.size); std::vector<unsigned char> buffer(partition.size);
fuse_sideload/fuse_sideload.cpp
+1 -1
View File
@@ -392,7 +392,7 @@ int run_fuse_sideload(std::unique_ptr<FuseDataProvider>&& provider, const char*
} }
fd.ffd.reset(open("/dev/fuse", O_RDWR)); fd.ffd.reset(open("/dev/fuse", O_RDWR));
if (!fd.ffd) { if (fd.ffd == -1) {
perror("open /dev/fuse"); perror("open /dev/fuse");
result = -1; result = -1;
goto done; goto done;