diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2016-11-21 20:24:08 +0100 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-11-21 20:24:09 +0100 |
commit | a511a3c4071d5b119605e9edcddc04a715581955 (patch) | |
tree | f89fd18f4a0669875599ea8647a29570a3bf7a3e | |
parent | Merge "Fail gracefully when we fail to fork the update binary" (diff) | |
parent | applypatch: Release FD when explicitly calling close. (diff) | |
download | android_bootable_recovery-a511a3c4071d5b119605e9edcddc04a715581955.tar android_bootable_recovery-a511a3c4071d5b119605e9edcddc04a715581955.tar.gz android_bootable_recovery-a511a3c4071d5b119605e9edcddc04a715581955.tar.bz2 android_bootable_recovery-a511a3c4071d5b119605e9edcddc04a715581955.tar.lz android_bootable_recovery-a511a3c4071d5b119605e9edcddc04a715581955.tar.xz android_bootable_recovery-a511a3c4071d5b119605e9edcddc04a715581955.tar.zst android_bootable_recovery-a511a3c4071d5b119605e9edcddc04a715581955.zip |
-rw-r--r-- | applypatch/applypatch.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/applypatch/applypatch.cpp b/applypatch/applypatch.cpp index 9b84fa104..41a8d582b 100644 --- a/applypatch/applypatch.cpp +++ b/applypatch/applypatch.cpp @@ -210,7 +210,7 @@ int SaveFileContents(const char* filename, const FileContents* file) { printf("fsync of \"%s\" failed: %s\n", filename, strerror(errno)); return -1; } - if (ota_close(fd) != 0) { + if (ota_close(fd.release()) != 0) { printf("close of \"%s\" failed: %s\n", filename, strerror(errno)); 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)); return -1; } - if (ota_close(fd) != 0) { + if (ota_close(fd.release()) != 0) { printf("failed to close %s: %s\n", partition, strerror(errno)); return -1; } @@ -287,7 +287,7 @@ int WriteToPartition(const unsigned char* data, size_t len, const std::string& t } else { printf(" caches dropped\n"); } - ota_close(dc); + ota_close(dc.release()); sleep(1); // Verify. @@ -339,7 +339,7 @@ int WriteToPartition(const unsigned char* data, size_t len, const std::string& t return -1; } - if (ota_close(fd) == -1) { + if (ota_close(fd.release()) == -1) { printf("error closing %s: %s\n", partition, strerror(errno)); 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)); 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)); result = 1; } |