From 04929302d75ab51d29fcf75752180481d18224fe Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sat, 22 Jun 2019 00:40:23 -0500 Subject: [PATCH] [ox/fs] Rename confusing parameters in FileStoreTemplate::read --- deps/ox/src/ox/fs/filestore/filestoretemplate.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp b/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp index 0cd3f0fa..dc289419 100644 --- a/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp +++ b/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp @@ -311,7 +311,7 @@ Error FileStoreTemplate::remove(InodeId_t id) { } template -Error FileStoreTemplate::read(InodeId_t id, void *data, FsSize_t dataSize, FsSize_t *size) const { +Error FileStoreTemplate::read(InodeId_t id, void *out, FsSize_t outSize, FsSize_t *size) const { oxTrace("ox::fs::FileStoreTemplate::read") << "Attempting to read from inode" << id; auto src = find(id); @@ -325,19 +325,19 @@ Error FileStoreTemplate::read(InodeId_t id, void *data, FsSize_t dataSiz auto srcData = m_buffer->template dataOf(src); oxTrace("ox::fs::FileStoreTemplate::read::found") << id << "found at"<< src.offset() << "with data section at" << srcData.offset(); - oxTrace("ox::fs::FileStoreTemplate::read::outSize") << srcData.offset() << srcData.size() << dataSize; + oxTrace("ox::fs::FileStoreTemplate::read::outSize") << srcData.offset() << srcData.size() << outSize; // error check - if (!(srcData.valid() && srcData.size() <= dataSize)) { + if (!(srcData.valid() && srcData.size() <= outSize)) { oxTrace("ox::fs::FileStoreTemplate::read::fail") << "Could not read data section of item:" << id; oxTrace("ox::fs::FileStoreTemplate::read::fail").del("") << "Item data section size: " << srcData.size() - << ", Expected size: " << dataSize; + << ", Expected size: " << outSize; return OxError(1); } - ox_memcpy(data, srcData, srcData.size()); + ox_memcpy(out, srcData, srcData.size()); if (size) { *size = src.size(); }