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

[ox/fs] Rename Result<const char*> FileSystem::read to directAccess

Browse Source
This commit is contained in:
Gary Talent 2021-04-18 15:03:45 -05:00
parent 9d74c5b464
commit 858ba9fe8d
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
deps/ox/src/ox/fs/filesystem/filesystem.hpp vendored
View File

@ -32,13 +32,13 @@ class FileSystem {
virtual Error read(const char *path, void *buffer, std::size_t buffSize) noexcept = 0; virtual Error read(const char *path, void *buffer, std::size_t buffSize) noexcept = 0;
virtual Result<const uint8_t*> read(const char *path) noexcept = 0; virtual Result<const uint8_t*> directAccess(const char *path) noexcept = 0;
virtual Error read(uint64_t inode, void *buffer, std::size_t size) noexcept = 0; virtual Error read(uint64_t inode, void *buffer, std::size_t size) noexcept = 0;
virtual Error read(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept = 0; virtual Error read(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept = 0;
virtual Result<const uint8_t*> read(uint64_t inode) noexcept = 0; virtual Result<const uint8_t*> directAccess(uint64_t inode) noexcept = 0;
Error read(FileAddress addr, void *buffer, std::size_t size) noexcept; Error read(FileAddress addr, void *buffer, std::size_t size) noexcept;
@ -122,13 +122,13 @@ class FileSystemTemplate: public FileSystem {
Error read(const char *path, void *buffer, std::size_t buffSize) noexcept override; Error read(const char *path, void *buffer, std::size_t buffSize) noexcept override;
Result<const uint8_t*> read(const char*) noexcept override; Result<const uint8_t*> directAccess(const char*) noexcept override;
Error read(uint64_t inode, void *buffer, std::size_t size) noexcept override; Error read(uint64_t inode, void *buffer, std::size_t size) noexcept override;
Error read(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept override; Error read(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept override;
Result<const uint8_t*> read(uint64_t) noexcept override; Result<const uint8_t*> directAccess(uint64_t) noexcept override;
Result<Vector<String>> ls(const char *dir) noexcept override; Result<Vector<String>> ls(const char *dir) noexcept override;
@ -247,13 +247,13 @@ Error FileSystemTemplate<FileStore, Directory>::read(const char *path, void *buf
} }
template<typename FileStore, typename Directory> template<typename FileStore, typename Directory>
Result<const uint8_t*> FileSystemTemplate<FileStore, Directory>::read(const char *path) noexcept { Result<const uint8_t*> FileSystemTemplate<FileStore, Directory>::directAccess(const char *path) noexcept {
auto fd = fileSystemData(); auto fd = fileSystemData();
oxReturnError(fd.error); oxReturnError(fd.error);
Directory rootDir(m_fs, fd.value.rootDirInode); Directory rootDir(m_fs, fd.value.rootDirInode);
auto [inode, err] = rootDir.find(path); auto [inode, err] = rootDir.find(path);
oxReturnError(err); oxReturnError(err);
return read(inode); return directAccess(inode);
} }
template<typename FileStore, typename Directory> template<typename FileStore, typename Directory>
@ -267,7 +267,7 @@ Error FileSystemTemplate<FileStore, Directory>::read(uint64_t inode, std::size_t
} }
template<typename FileStore, typename Directory> template<typename FileStore, typename Directory>
Result<const uint8_t*> FileSystemTemplate<FileStore, Directory>::read(uint64_t inode) noexcept { Result<const uint8_t*> FileSystemTemplate<FileStore, Directory>::directAccess(uint64_t inode) noexcept {
auto data = m_fs.read(inode); auto data = m_fs.read(inode);
if (!data.valid()) { if (!data.valid()) {
return OxError(1); return OxError(1);

8
deps/ox/src/ox/fs/filesystem/passthroughfs.cpp vendored
View File

@ -74,8 +74,8 @@ Error PassThroughFS::read(const char *path, void *buffer, std::size_t buffSize)
return OxError(0); return OxError(0);
} }
Result<const uint8_t*> PassThroughFS::read(const char*) noexcept { Result<const uint8_t*> PassThroughFS::directAccess(const char*) noexcept {
return OxError(1); return OxError(1, "PassThroughFS::directAccess not supported");
} }
Error PassThroughFS::read(uint64_t, void*, std::size_t) noexcept { Error PassThroughFS::read(uint64_t, void*, std::size_t) noexcept {
@ -88,8 +88,8 @@ Error PassThroughFS::read(uint64_t, std::size_t, std::size_t, void*, std::size_t
return OxError(1); return OxError(1);
} }
Result<const uint8_t*> PassThroughFS::read(uint64_t) noexcept { Result<const uint8_t*> PassThroughFS::directAccess(uint64_t) noexcept {
return OxError(1); return OxError(1, "PassThroughFS::directAccess not supported");
} }
Result<Vector<String>> PassThroughFS::ls(const char *dir) noexcept { Result<Vector<String>> PassThroughFS::ls(const char *dir) noexcept {

4
deps/ox/src/ox/fs/filesystem/passthroughfs.hpp vendored
View File

@ -43,13 +43,13 @@ class PassThroughFS: public FileSystem {
Error read(const char *path, void *buffer, std::size_t buffSize) noexcept override; Error read(const char *path, void *buffer, std::size_t buffSize) noexcept override;
Result<const uint8_t*> read(const char*) noexcept override; Result<const uint8_t*> directAccess(const char*) noexcept override;
Error read(uint64_t inode, void *buffer, std::size_t size) noexcept override; Error read(uint64_t inode, void *buffer, std::size_t size) noexcept override;
Error read(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept override; Error read(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) noexcept override;
Result<const uint8_t*> read(uint64_t) noexcept override; Result<const uint8_t*> directAccess(uint64_t) noexcept override;
Result<Vector<String>> ls(const char *dir) noexcept override; Result<Vector<String>> ls(const char *dir) noexcept override;