drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 9 Activity

[ox/fs] Rename confusing parameters in FileStoreTemplate::read

Browse Source
This commit is contained in:
Gary Talent 2019-06-22 00:40:23 -05:00
parent 3938cb0282
commit 04929302d7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deps/ox/src/ox/fs/filestore/filestoretemplate.hpp vendored
View File

@ -311,7 +311,7 @@ Error FileStoreTemplate<size_t>::remove(InodeId_t id) {
} }
template<typename size_t> template<typename size_t>
Error FileStoreTemplate<size_t>::read(InodeId_t id, void *data, FsSize_t dataSize, FsSize_t *size) const { Error FileStoreTemplate<size_t>::read(InodeId_t id, void *out, FsSize_t outSize, FsSize_t *size) const {
oxTrace("ox::fs::FileStoreTemplate::read") << "Attempting to read from inode" << id; oxTrace("ox::fs::FileStoreTemplate::read") << "Attempting to read from inode" << id;
auto src = find(id); auto src = find(id);
@ -325,19 +325,19 @@ Error FileStoreTemplate<size_t>::read(InodeId_t id, void *data, FsSize_t dataSiz
auto srcData = m_buffer->template dataOf<uint8_t>(src); auto srcData = m_buffer->template dataOf<uint8_t>(src);
oxTrace("ox::fs::FileStoreTemplate::read::found") << id << "found at"<< src.offset() oxTrace("ox::fs::FileStoreTemplate::read::found") << id << "found at"<< src.offset()
<< "with data section at" << srcData.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 // error check
if (!(srcData.valid() && srcData.size() <= dataSize)) { if (!(srcData.valid() && srcData.size() <= outSize)) {
oxTrace("ox::fs::FileStoreTemplate::read::fail") oxTrace("ox::fs::FileStoreTemplate::read::fail")
<< "Could not read data section of item:" << id; << "Could not read data section of item:" << id;
oxTrace("ox::fs::FileStoreTemplate::read::fail").del("") oxTrace("ox::fs::FileStoreTemplate::read::fail").del("")
<< "Item data section size: " << srcData.size() << "Item data section size: " << srcData.size()
<< ", Expected size: " << dataSize; << ", Expected size: " << outSize;
return OxError(1); return OxError(1);
} }
ox_memcpy(data, srcData, srcData.size()); ox_memcpy(out, srcData, srcData.size());
if (size) { if (size) {
*size = src.size(); *size = src.size();
} }