diff options
author | Tao Bao <tbao@google.com> | 2016-11-29 06:15:18 +0100 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-11-29 06:15:18 +0100 |
commit | eed7f607cfdec23e63f6d9e456801f7097a91127 (patch) | |
tree | d9632b1264748a0a4005a5ebc84535740a7675c9 /otafault/ota_io.cpp | |
parent | Merge "tests: Add testcases for EMMC targets." (diff) | |
parent | Add ota_close(unique_fd&) and ota_fclose(std::unique_ptr<FILE>&). (diff) | |
download | android_bootable_recovery-eed7f607cfdec23e63f6d9e456801f7097a91127.tar android_bootable_recovery-eed7f607cfdec23e63f6d9e456801f7097a91127.tar.gz android_bootable_recovery-eed7f607cfdec23e63f6d9e456801f7097a91127.tar.bz2 android_bootable_recovery-eed7f607cfdec23e63f6d9e456801f7097a91127.tar.lz android_bootable_recovery-eed7f607cfdec23e63f6d9e456801f7097a91127.tar.xz android_bootable_recovery-eed7f607cfdec23e63f6d9e456801f7097a91127.tar.zst android_bootable_recovery-eed7f607cfdec23e63f6d9e456801f7097a91127.zip |
Diffstat (limited to 'otafault/ota_io.cpp')
-rw-r--r-- | otafault/ota_io.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/otafault/ota_io.cpp b/otafault/ota_io.cpp index 2efd3004a..874cb1d5c 100644 --- a/otafault/ota_io.cpp +++ b/otafault/ota_io.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include <map> +#include "ota_io.h" #include <errno.h> #include <fcntl.h> @@ -22,8 +22,10 @@ #include <sys/stat.h> #include <unistd.h> +#include <map> +#include <memory> + #include "config.h" -#include "ota_io.h" static std::map<intptr_t, const char*> filename_cache; static std::string read_fault_file_name = ""; @@ -74,11 +76,19 @@ int ota_close(int fd) { return close(fd); } +int ota_close(unique_fd& fd) { + return ota_close(fd.release()); +} + int ota_fclose(FILE* fh) { filename_cache.erase((intptr_t)fh); return fclose(fh); } +int ota_fclose(std::unique_ptr<FILE, int (*)(FILE*)>& fh) { + return ota_fclose(fh.release()); +} + size_t ota_fread(void* ptr, size_t size, size_t nitems, FILE* stream) { if (should_fault_inject(OTAIO_READ)) { auto cached = filename_cache.find((intptr_t)stream); |