diff --git a/src/common/filesystem/include/fs_files.h b/src/common/filesystem/include/fs_files.h index 7f9eff9e9..8ae78b2b3 100644 --- a/src/common/filesystem/include/fs_files.h +++ b/src/common/filesystem/include/fs_files.h @@ -265,36 +265,14 @@ public: return mReader->Read(buffer, len); } - FileData Read(size_t len) - { - FileData buffer; - if (len > 0) - { - Size length = mReader->Read(buffer.allocate(len), len); - if ((size_t)length < len) buffer.allocate(length); - } - return buffer; - } + FileData Read(size_t len); + FileData ReadPadded(size_t padding); FileData Read() { return Read(GetLength()); } - FileData ReadPadded(size_t padding) - { - auto len = GetLength(); - FileData buffer; - - if (len > 0) - { - auto p = (char*)buffer.allocate(len + padding); - Size length = mReader->Read(p, len); - if (length < len) buffer.clear(); - else memset(p + len, 0, padding); - } - return buffer; - } char *Gets(char *strbuf, Size len) { diff --git a/src/common/filesystem/source/files.cpp b/src/common/filesystem/source/files.cpp index 819550310..ac0581119 100644 --- a/src/common/filesystem/source/files.cpp +++ b/src/common/filesystem/source/files.cpp @@ -402,6 +402,32 @@ bool FileReader::OpenMemoryArray(FileData& data) return true; } +FileData FileReader::Read(size_t len) +{ + FileData buffer; + if (len > 0) + { + Size length = mReader->Read(buffer.allocate(len), len); + if ((size_t)length < len) buffer.allocate(length); + } + return buffer; +} + +FileData FileReader::ReadPadded(size_t padding) +{ + auto len = GetLength(); + FileData buffer; + + if (len > 0) + { + auto p = (char*)buffer.allocate(len + padding); + Size length = mReader->Read(p, len); + if (length < len) buffer.clear(); + else memset(p + len, 0, padding); + } + return buffer; +} + //==========================================================================