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 /otafault/ota_io.h | |
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 'otafault/ota_io.h')
-rw-r--r-- | otafault/ota_io.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/otafault/ota_io.h b/otafault/ota_io.h index 45d17b1bb..395b4230e 100644 --- a/otafault/ota_io.h +++ b/otafault/ota_io.h @@ -40,10 +40,6 @@ int ota_open(const char* path, int oflags, mode_t mode); FILE* ota_fopen(const char* filename, const char* mode); -int ota_close(int fd); - -int ota_fclose(FILE* fh); - size_t ota_fread(void* ptr, size_t size, size_t nitems, FILE* stream); ssize_t ota_read(int fd, void* buf, size_t nbyte); @@ -55,15 +51,19 @@ ssize_t ota_write(int fd, const void* buf, size_t nbyte); int ota_fsync(int fd); struct OtaCloser { - static void Close(int fd) { - ota_close(fd); - } + static void Close(int); }; using unique_fd = android::base::unique_fd_impl<OtaCloser>; int ota_close(unique_fd& fd); -int ota_fclose(std::unique_ptr<FILE, int (*)(FILE*)>& fh); +struct OtaFcloser { + void operator()(FILE*); +}; + +using unique_file = std::unique_ptr<FILE, OtaFcloser>; + +int ota_fclose(unique_file& fh); #endif |