diff options
| author | Martin Ridgers <[email protected]> | 2021-10-14 13:31:47 +0200 |
|---|---|---|
| committer | Martin Ridgers <[email protected]> | 2021-10-14 13:33:08 +0200 |
| commit | 93e44bea3849762586a679cc42672fd7cbdd770e (patch) | |
| tree | 554315a30f2663a5509e573a0886189fd36bc7bd /zencore | |
| parent | Implemented basicfile.cpp for POSIX platforms (diff) | |
| download | zen-93e44bea3849762586a679cc42672fd7cbdd770e.tar.xz zen-93e44bea3849762586a679cc42672fd7cbdd770e.zip | |
Use std::fs::path for IoBuffer::MakeFromFile().
This is more consistent with MakeFromTempFile() and almost all
arguments are path objects anyway.
Diffstat (limited to 'zencore')
| -rw-r--r-- | zencore/include/zencore/iobuffer.h | 4 | ||||
| -rw-r--r-- | zencore/iobuffer.cpp | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/zencore/include/zencore/iobuffer.h b/zencore/include/zencore/iobuffer.h index 5fbeaeaeb..380199066 100644 --- a/zencore/include/zencore/iobuffer.h +++ b/zencore/include/zencore/iobuffer.h @@ -368,10 +368,8 @@ private: class IoBufferBuilder { - using path_char_t = std::filesystem::path::value_type; - public: - ZENCORE_API static IoBuffer MakeFromFile(const path_char_t* FileName, uint64_t Offset = 0, uint64_t Size = ~0ull); + ZENCORE_API static IoBuffer MakeFromFile(const std::filesystem::path& FileName, uint64_t Offset = 0, uint64_t Size = ~0ull); ZENCORE_API static IoBuffer MakeFromTemporaryFile(const std::filesystem::path& FileName); ZENCORE_API static IoBuffer MakeFromFileHandle(void* FileHandle, uint64_t Offset = 0, uint64_t Size = ~0ull); inline static IoBuffer MakeCloneFromMemory(const void* Ptr, size_t Sz) { return IoBuffer(IoBuffer::Clone, Ptr, Sz); } diff --git a/zencore/iobuffer.cpp b/zencore/iobuffer.cpp index 922c14f83..3b28a42c2 100644 --- a/zencore/iobuffer.cpp +++ b/zencore/iobuffer.cpp @@ -377,14 +377,14 @@ IoBufferBuilder::MakeFromFileHandle(void* FileHandle, uint64_t Offset, uint64_t } IoBuffer -IoBufferBuilder::MakeFromFile(const path_char_t* FileName, uint64_t Offset, uint64_t Size) +IoBufferBuilder::MakeFromFile(const std::filesystem::path& FileName, uint64_t Offset, uint64_t Size) { uint64_t FileSize; # if ZEN_PLATFORM_WINDOWS CAtlFile DataFile; - HRESULT hRes = DataFile.Create(FileName, GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING); + HRESULT hRes = DataFile.Create(FileName.c_str(), GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING); if (FAILED(hRes)) { @@ -393,7 +393,7 @@ IoBufferBuilder::MakeFromFile(const path_char_t* FileName, uint64_t Offset, uint DataFile.GetSize((ULONGLONG&)FileSize); # else - int Fd = open(FileName, O_RDONLY); + int Fd = open(FileName.c_str(), O_RDONLY); if (Fd < 0) { return {}; |