From 7132f71cf010e4f13eb27c1a24d8878aa984b43f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 29 Mar 2017 18:31:00 +0300 Subject: Remove extra memory copy in VirtFs::loadFile. Also add const into VirtFs::loadFile. --- src/fs/virtfs/virtfs.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/fs/virtfs/virtfs.cpp') diff --git a/src/fs/virtfs/virtfs.cpp b/src/fs/virtfs/virtfs.cpp index 9d1432270..d9423f66e 100644 --- a/src/fs/virtfs/virtfs.cpp +++ b/src/fs/virtfs/virtfs.cpp @@ -562,8 +562,8 @@ namespace VirtFs return file->funcs->eof(file); } - char *loadFile(std::string filename, - int &restrict fileSize) + const char *loadFile(std::string filename, + int &restrict fileSize) { prepareFsPath(filename); if (checkPath(filename) == false) @@ -575,7 +575,9 @@ namespace VirtFs FOR_EACH (std::vector::const_iterator, it, mEntries) { VirtFsEntry *const entry = *it; - char *const buf = entry->funcs->loadFile(entry, filename, fileSize); + const char *const buf = entry->funcs->loadFile(entry, + filename, + fileSize); if (buf != nullptr) return buf; } -- cgit v1.2.3-60-g2f50