summaryrefslogtreecommitdiffstats
path: root/applypatch
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2016-11-28 20:48:43 +0100
committerTao Bao <tbao@google.com>2016-11-28 21:09:39 +0100
commit358c2ec1dca24d48a503b441d38545ace021ea8e (patch)
tree433b869340d93bf43ed46916abbcf1cf218e1fb6 /applypatch
parentAdd ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&). (diff)
downloadandroid_bootable_recovery-358c2ec1dca24d48a503b441d38545ace021ea8e.tar
android_bootable_recovery-358c2ec1dca24d48a503b441d38545ace021ea8e.tar.gz
android_bootable_recovery-358c2ec1dca24d48a503b441d38545ace021ea8e.tar.bz2
android_bootable_recovery-358c2ec1dca24d48a503b441d38545ace021ea8e.tar.lz
android_bootable_recovery-358c2ec1dca24d48a503b441d38545ace021ea8e.tar.xz
android_bootable_recovery-358c2ec1dca24d48a503b441d38545ace021ea8e.tar.zst
android_bootable_recovery-358c2ec1dca24d48a503b441d38545ace021ea8e.zip
Diffstat (limited to '')
-rw-r--r--applypatch/applypatch.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/applypatch/applypatch.cpp b/applypatch/applypatch.cpp
index 0250407a5..95389da6e 100644
--- a/applypatch/applypatch.cpp
+++ b/applypatch/applypatch.cpp
@@ -66,7 +66,7 @@ int LoadFileContents(const char* filename, FileContents* file) {
}
std::vector<unsigned char> data(file->st.st_size);
- std::unique_ptr<FILE, int (*)(FILE*)> f(ota_fopen(filename, "rb"), ota_fclose);
+ unique_file f(ota_fopen(filename, "rb"));
if (!f) {
printf("failed to open \"%s\": %s\n", filename, strerror(errno));
return -1;
@@ -118,7 +118,7 @@ static int LoadPartitionContents(const std::string& filename, FileContents* file
std::sort(pairs.begin(), pairs.end());
const char* partition = pieces[1].c_str();
- std::unique_ptr<FILE, int (*)(FILE*)> dev(ota_fopen(partition, "rb"), ota_fclose);
+ unique_file dev(ota_fopen(partition, "rb"));
if (!dev) {
printf("failed to open emmc partition \"%s\": %s\n", partition, strerror(errno));
return -1;