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

[ox/fs] Remove noexcept from ls and add it to FileSystemTemplate constructors and destructor

Browse Source
This commit is contained in:
Gary Talent 2021-04-17 00:51:05 -05:00
parent 8eb19b4cba
commit 96f79757cf
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,15 +102,15 @@ class FileSystemTemplate: public FileSystem {
void(*m_freeBuffer)(char*) = nullptr; void(*m_freeBuffer)(char*) = nullptr;
public: public:
FileSystemTemplate() = default; FileSystemTemplate() noexcept = default;
FileSystemTemplate(void *buffer, uint64_t bufferSize, void(*freeBuffer)(char*) = [] (char *buff) { delete buff; }); FileSystemTemplate(void *buffer, uint64_t bufferSize, void(*freeBuffer)(char*) = [](char *buff) { delete buff; }) noexcept;
FileSystemTemplate(FileStore fs); FileSystemTemplate(FileStore fs) noexcept;
~FileSystemTemplate(); ~FileSystemTemplate() noexcept;
static Error format(void *buff, uint64_t buffSize); static Error format(void *buff, uint64_t buffSize) noexcept;
Error mkdir(const char *path, bool recursive = false) noexcept override; Error mkdir(const char *path, bool recursive = false) noexcept override;
@ -127,7 +127,7 @@ class FileSystemTemplate: public FileSystem {
Result<uint8_t*> read(uint64_t) noexcept override; Result<uint8_t*> read(uint64_t) noexcept override;
template<typename F> template<typename F>
Error ls(const char *dir, F cb) noexcept; Error ls(const char *dir, F cb);
Error remove(const char *path, bool recursive = false) noexcept override; Error remove(const char *path, bool recursive = false) noexcept override;
@ -171,25 +171,25 @@ class FileSystemTemplate: public FileSystem {
}; };
template<typename FileStore, typename Directory> template<typename FileStore, typename Directory>
FileSystemTemplate<FileStore, Directory>::FileSystemTemplate(FileStore fs) { FileSystemTemplate<FileStore, Directory>::FileSystemTemplate(FileStore fs) noexcept {
m_fs = fs; m_fs = fs;
} }
template<typename FileStore, typename Directory> template<typename FileStore, typename Directory>
FileSystemTemplate<FileStore, Directory>::FileSystemTemplate(void *buffer, uint64_t bufferSize, void(*freeBuffer)(char*)): FileSystemTemplate<FileStore, Directory>::FileSystemTemplate(void *buffer, uint64_t bufferSize, void(*freeBuffer)(char*)) noexcept:
m_fs(buffer, bufferSize), m_fs(buffer, bufferSize),
m_freeBuffer(freeBuffer) { m_freeBuffer(freeBuffer) {
} }
template<typename FileStore, typename Directory> template<typename FileStore, typename Directory>
FileSystemTemplate<FileStore, Directory>::~FileSystemTemplate() { FileSystemTemplate<FileStore, Directory>::~FileSystemTemplate() noexcept {
if (m_freeBuffer && m_fs.buff()) { if (m_freeBuffer && m_fs.buff()) {
m_freeBuffer(m_fs.buff()); m_freeBuffer(m_fs.buff());
} }
} }
template<typename FileStore, typename Directory> template<typename FileStore, typename Directory>
Error FileSystemTemplate<FileStore, Directory>::format(void *buff, uint64_t buffSize) { Error FileSystemTemplate<FileStore, Directory>::format(void *buff, uint64_t buffSize) noexcept {
oxReturnError(FileStore::format(buff, buffSize)); oxReturnError(FileStore::format(buff, buffSize));
FileStore fs(buff, buffSize); FileStore fs(buff, buffSize);
@ -271,7 +271,7 @@ Result<uint8_t*> FileSystemTemplate<FileStore, Directory>::read(uint64_t inode)
template<typename FileStore, typename Directory> template<typename FileStore, typename Directory>
template<typename F> template<typename F>
Error FileSystemTemplate<FileStore, Directory>::ls(const char *path, F cb) noexcept { Error FileSystemTemplate<FileStore, Directory>::ls(const char *path, F cb) {
oxTrace("ox::FileSystemTemplate::ls") << "path:" << path; oxTrace("ox::FileSystemTemplate::ls") << "path:" << path;
auto [s, err] = stat(path); auto [s, err] = stat(path);
oxReturnError(err); oxReturnError(err);