drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 13 Activity

[ox/fs] More cleanup and bug fix from previous cleanup

Browse Source
This commit is contained in:
Gary Talent
2024-09-13 23:32:13 -05:00
parent 702b166b8d
commit 2a58490521
7 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -315,7 +315,7 @@ Error FileStoreTemplate<size_t>::remove(uint64_t id) {
template<typename size_t>
Error FileStoreTemplate<size_t>::read(uint64_t id, void *out, FsSize_t outSize, FsSize_t *size) const {
oxTracef("ox.fs.FileStoreTemplate.read", "Attempting to read from inode {}", id);
oxTracef("ox.fs.FileStoreTemplate.read", "Attempting to read inode {}", id);
auto src = find(static_cast<size_t>(id));
// error check
if (!src.valid()) {
@@ -333,7 +333,7 @@ Error FileStoreTemplate<size_t>::read(uint64_t id, void *out, FsSize_t outSize,
oxTracef("ox.fs.FileStoreTemplate.read.fail", "Could not read data section of item: {}", id);
oxTracef("ox.fs.FileStoreTemplate.read.fail",
"Item data section size: {}, Expected size: {}", srcData.size(), outSize);
return OxError(1);
return OxError(1, "Invalid inode");
}
ox::memcpy(out, srcData, srcData.size());
@@ -341,7 +341,7 @@ Error FileStoreTemplate<size_t>::read(uint64_t id, void *out, FsSize_t outSize,
*size = src.size();
}
return OxError(0);
return {};
}
template<typename size_t>