diff options
| author | Stefan Boberg <[email protected]> | 2021-10-08 19:14:53 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2021-10-08 19:14:53 +0200 |
| commit | bf44a68e10bfe6f4e162c109f1a1628a62bcde48 (patch) | |
| tree | 204ac0099c96c13a2449cdcb74384818991372d1 | |
| parent | zenstore: Added forcelink stuff to ensure we bring in filecas tests (diff) | |
| download | zen-bf44a68e10bfe6f4e162c109f1a1628a62bcde48.tar.xz zen-bf44a68e10bfe6f4e162c109f1a1628a62bcde48.zip | |
iobuffer: Changed MakeFromTemporaryFile so it accepts a path instead of a character pointer
| -rw-r--r-- | zencore/include/zencore/iobuffer.h | 2 | ||||
| -rw-r--r-- | zencore/iobuffer.cpp | 6 | ||||
| -rw-r--r-- | zenserver/projectstore.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/zencore/include/zencore/iobuffer.h b/zencore/include/zencore/iobuffer.h index 110cd7d9d..5fbeaeaeb 100644 --- a/zencore/include/zencore/iobuffer.h +++ b/zencore/include/zencore/iobuffer.h @@ -372,7 +372,7 @@ class IoBufferBuilder public: ZENCORE_API static IoBuffer MakeFromFile(const path_char_t* FileName, uint64_t Offset = 0, uint64_t Size = ~0ull); - ZENCORE_API static IoBuffer MakeFromTemporaryFile(const path_char_t* FileName); + 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 04685defc..922c14f83 100644 --- a/zencore/iobuffer.cpp +++ b/zencore/iobuffer.cpp @@ -437,7 +437,7 @@ IoBufferBuilder::MakeFromFile(const path_char_t* FileName, uint64_t Offset, uint } IoBuffer -IoBufferBuilder::MakeFromTemporaryFile(const path_char_t* FileName) +IoBufferBuilder::MakeFromTemporaryFile(const std::filesystem::path& FileName) { uint64_t FileSize; void* Handle; @@ -449,7 +449,7 @@ IoBufferBuilder::MakeFromTemporaryFile(const path_char_t* FileName) // when a file has been written to a staging directory, and is going // to be moved in place - HRESULT hRes = DataFile.Create(FileName, GENERIC_READ | DELETE, FILE_SHARE_READ | FILE_SHARE_DELETE, OPEN_EXISTING); + HRESULT hRes = DataFile.Create(FileName.native().c_str(), GENERIC_READ | DELETE, FILE_SHARE_READ | FILE_SHARE_DELETE, OPEN_EXISTING); if (FAILED(hRes)) { @@ -460,7 +460,7 @@ IoBufferBuilder::MakeFromTemporaryFile(const path_char_t* FileName) Handle = DataFile.Detach(); # else - int Fd = open(FileName, O_RDONLY); + int Fd = open(FileName.native().c_str(), O_RDONLY); if (Fd < 0) { return {}; diff --git a/zenserver/projectstore.cpp b/zenserver/projectstore.cpp index 5c4983472..f14bc7896 100644 --- a/zenserver/projectstore.cpp +++ b/zenserver/projectstore.cpp @@ -1403,7 +1403,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects) { return SharedBuffer(std::move(Data)); } - else if (Data = IoBufferBuilder::MakeFromTemporaryFile(AttachmentPath.native().c_str())) + else if (Data = IoBufferBuilder::MakeFromTemporaryFile(AttachmentPath)) { return SharedBuffer(std::move(Data)); } |