aboutsummaryrefslogtreecommitdiff
path: root/src/zenutil
diff options
context:
space:
mode:
Diffstat (limited to 'src/zenutil')
-rw-r--r--src/zenutil/basicfile.cpp12
-rw-r--r--src/zenutil/include/zenutil/basicfile.h3
2 files changed, 12 insertions, 3 deletions
diff --git a/src/zenutil/basicfile.cpp b/src/zenutil/basicfile.cpp
index ad98bf652..f553fe5a0 100644
--- a/src/zenutil/basicfile.cpp
+++ b/src/zenutil/basicfile.cpp
@@ -272,7 +272,7 @@ BasicFile::Write(CompositeBuffer Data, uint64_t FileOffset, std::error_code& Ec)
for (const SharedBuffer& Buffer : Data.GetSegments())
{
MemoryView BlockView = Buffer.GetView();
- Write(BlockView, FileOffset, Ec);
+ Write(BlockView, FileOffset + WrittenBytes, Ec);
if (Ec)
{
@@ -490,6 +490,14 @@ BasicFile::SetFileSize(uint64_t FileSize)
#endif
}
+void
+BasicFile::Attach(void* Handle)
+{
+ ZEN_ASSERT(Handle != nullptr);
+ ZEN_ASSERT(m_FileHandle == nullptr);
+ m_FileHandle = Handle;
+}
+
void*
BasicFile::Detach()
{
@@ -716,7 +724,7 @@ BasicFileWriter::~BasicFileWriter()
}
void
-BasicFileWriter::Write(void* Data, uint64_t Size, uint64_t FileOffset)
+BasicFileWriter::Write(const void* Data, uint64_t Size, uint64_t FileOffset)
{
if (m_Buffer == nullptr || (Size >= m_BufferSize))
{
diff --git a/src/zenutil/include/zenutil/basicfile.h b/src/zenutil/include/zenutil/basicfile.h
index f25d9f23c..0e4295ee3 100644
--- a/src/zenutil/include/zenutil/basicfile.h
+++ b/src/zenutil/include/zenutil/basicfile.h
@@ -65,6 +65,7 @@ public:
void SetFileSize(uint64_t FileSize);
IoBuffer ReadAll();
void WriteAll(IoBuffer Data, std::error_code& Ec);
+ void Attach(void* Handle);
void* Detach();
inline void* Handle() { return m_FileHandle; }
@@ -165,7 +166,7 @@ public:
BasicFileWriter(BasicFile& Base, uint64_t BufferSize);
~BasicFileWriter();
- void Write(void* Data, uint64_t Size, uint64_t FileOffset);
+ void Write(const void* Data, uint64_t Size, uint64_t FileOffset);
void Flush();
private: