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

Merge "applypatch: Release FD when explicitly calling close."

Browse Source
This commit is contained in:
Treehugger Robot
2016-11-21 19:24:08 +00:00
committed by Gerrit Code Review
parent 340a2d364f 48cf770471
commit a511a3c407
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applypatch/applypatch.cpp
+5 -5
View File
@@ -210,7 +210,7 @@ int SaveFileContents(const char* filename, const FileContents* file) {
printf("fsync of \"%s\" failed: %s\n", filename, strerror(errno)); printf("fsync of \"%s\" failed: %s\n", filename, strerror(errno));
return -1; return -1;
} }
if (ota_close(fd) != 0) { if (ota_close(fd.release()) != 0) {
printf("close of \"%s\" failed: %s\n", filename, strerror(errno)); printf("close of \"%s\" failed: %s\n", filename, strerror(errno));
return -1; return -1;
} }
@@ -268,7 +268,7 @@ int WriteToPartition(const unsigned char* data, size_t len, const std::string& t
printf("failed to sync to %s: %s\n", partition, strerror(errno)); printf("failed to sync to %s: %s\n", partition, strerror(errno));
return -1; return -1;
} }
if (ota_close(fd) != 0) { if (ota_close(fd.release()) != 0) {
printf("failed to close %s: %s\n", partition, strerror(errno)); printf("failed to close %s: %s\n", partition, strerror(errno));
return -1; return -1;
} }
@@ -287,7 +287,7 @@ int WriteToPartition(const unsigned char* data, size_t len, const std::string& t
} else { } else {
printf(" caches dropped\n"); printf(" caches dropped\n");
} }
ota_close(dc); ota_close(dc.release());
sleep(1); sleep(1);
// Verify. // Verify.
@@ -339,7 +339,7 @@ int WriteToPartition(const unsigned char* data, size_t len, const std::string& t
return -1; return -1;
} }
if (ota_close(fd) == -1) { if (ota_close(fd.release()) == -1) {
printf("error closing %s: %s\n", partition, strerror(errno)); printf("error closing %s: %s\n", partition, strerror(errno));
return -1; return -1;
} }
@@ -782,7 +782,7 @@ static int GenerateTarget(FileContents* source_file,
printf("failed to fsync file \"%s\": %s\n", tmp_target_filename.c_str(), strerror(errno)); printf("failed to fsync file \"%s\": %s\n", tmp_target_filename.c_str(), strerror(errno));
result = 1; result = 1;
} }
if (ota_close(output_fd) != 0) { if (ota_close(output_fd.release()) != 0) {
printf("failed to close file \"%s\": %s\n", tmp_target_filename.c_str(), strerror(errno)); printf("failed to close file \"%s\": %s\n", tmp_target_filename.c_str(), strerror(errno));
result = 1; result = 1;
} }