diff options
author | Tao Bao <tbao@google.com> | 2016-11-29 18:59:10 +0100 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-11-29 18:59:10 +0100 |
commit | 1f934beedd1a2a1b3baec85d56ae64607ab0dbe1 (patch) | |
tree | ba2e9f541bfc0cafe304eece37b75e087f7587c8 /applypatch/applypatch.cpp | |
parent | Merge "Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&)." (diff) | |
parent | Merge "Remove ota_close(int) and ota_fclose(FILE*)." (diff) | |
download | android_bootable_recovery-1f934beedd1a2a1b3baec85d56ae64607ab0dbe1.tar android_bootable_recovery-1f934beedd1a2a1b3baec85d56ae64607ab0dbe1.tar.gz android_bootable_recovery-1f934beedd1a2a1b3baec85d56ae64607ab0dbe1.tar.bz2 android_bootable_recovery-1f934beedd1a2a1b3baec85d56ae64607ab0dbe1.tar.lz android_bootable_recovery-1f934beedd1a2a1b3baec85d56ae64607ab0dbe1.tar.xz android_bootable_recovery-1f934beedd1a2a1b3baec85d56ae64607ab0dbe1.tar.zst android_bootable_recovery-1f934beedd1a2a1b3baec85d56ae64607ab0dbe1.zip |
Diffstat (limited to 'applypatch/applypatch.cpp')
-rw-r--r-- | applypatch/applypatch.cpp | 4 |
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; |