From fe40b2e144304e24f51cf48c7b22ce285597ee07 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Fri, 16 Oct 2020 19:52:46 -0500 Subject: [PATCH] [ox] Cleanup unnecessary ox:: --- deps/ox/src/ox/claw/write.hpp | 2 +- .../src/ox/fs/filestore/filestoretemplate.hpp | 6 ++-- deps/ox/src/ox/fs/filesystem/directory.hpp | 10 +++--- deps/ox/src/ox/fs/filesystem/filelocation.hpp | 6 ++-- deps/ox/src/ox/fs/filesystem/filesystem.cpp | 4 +-- deps/ox/src/ox/fs/filesystem/filesystem.hpp | 30 ++++++++--------- .../ox/src/ox/fs/filesystem/passthroughfs.cpp | 2 +- .../ox/src/ox/fs/filesystem/passthroughfs.hpp | 32 +++++++++---------- deps/ox/src/ox/model/descwrite.hpp | 6 ++-- deps/ox/src/ox/model/optype.hpp | 2 +- deps/ox/src/ox/model/walk.hpp | 10 +++--- deps/ox/src/ox/ptrarith/nodebuffer.hpp | 2 +- deps/ox/src/ox/std/error.hpp | 6 ++-- 13 files changed, 59 insertions(+), 59 deletions(-) diff --git a/deps/ox/src/ox/claw/write.hpp b/deps/ox/src/ox/claw/write.hpp index 8347e617..23b29cfe 100644 --- a/deps/ox/src/ox/claw/write.hpp +++ b/deps/ox/src/ox/claw/write.hpp @@ -28,7 +28,7 @@ struct TypeInfoCatcher { this->name = name; } - constexpr ox::Error field(...) noexcept { + constexpr Error field(...) noexcept { return OxError(0); } diff --git a/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp b/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp index 4591286f..e8467b8b 100644 --- a/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp +++ b/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp @@ -412,7 +412,7 @@ const ptrarith::Ptr FileStoreTemplate::read(InodeI } template -ox::Error FileStoreTemplate::resize() { +Error FileStoreTemplate::resize() { oxReturnError(compact()); const auto newSize = size() - available(); oxTrace("ox::fs::FileStoreTemplate::resize") << "resize to:" << newSize; @@ -492,9 +492,9 @@ Result::InodeId_t> FileStoreTemplate: } template -ox::Error FileStoreTemplate::compact() { +Error FileStoreTemplate::compact() { auto isFirstItem = true; - return m_buffer->compact([this, &isFirstItem](uint64_t oldAddr, ItemPtr item) -> ox::Error { + return m_buffer->compact([this, &isFirstItem](uint64_t oldAddr, ItemPtr item) -> Error { if (isFirstItem) { isFirstItem = false; return OxError(0); diff --git a/deps/ox/src/ox/fs/filesystem/directory.hpp b/deps/ox/src/ox/fs/filesystem/directory.hpp index 2939087c..3a15ca25 100644 --- a/deps/ox/src/ox/fs/filesystem/directory.hpp +++ b/deps/ox/src/ox/fs/filesystem/directory.hpp @@ -130,7 +130,7 @@ Directory::Directory(FileStore fs, InodeId_t inodeId) { } template -ox::Error Directory::init() noexcept { +Error Directory::init() noexcept { constexpr auto Size = sizeof(Buffer); oxTrace("ox::fs::Directory::init") << "Initializing Directory with Inode ID:" << m_inodeId; oxReturnError(m_fs.write(m_inodeId, nullptr, Size, FileType_Directory)); @@ -145,7 +145,7 @@ ox::Error Directory::init() noexcept { } template -ox::Error Directory::mkdir(PathIterator path, bool parents, FileName *nameBuff) { +Error Directory::mkdir(PathIterator path, bool parents, FileName *nameBuff) { if (path.valid()) { oxTrace("ox::fs::Directory::mkdir") << path.fullPath(); // reuse nameBuff if it has already been allocated, as it is a rather large variable @@ -190,7 +190,7 @@ ox::Error Directory::mkdir(PathIterator path, bool parents } template -ox::Error Directory::write(PathIterator path, InodeId_t inode, FileName *nameBuff) noexcept { +Error Directory::write(PathIterator path, InodeId_t inode, FileName *nameBuff) noexcept { // reuse nameBuff if it has already been allocated, as it is a rather large variable if (nameBuff == nullptr) { nameBuff = reinterpret_cast(ox_alloca(sizeof(FileName))); @@ -261,7 +261,7 @@ ox::Error Directory::write(PathIterator path, InodeId_t in } template -ox::Error Directory::remove(PathIterator path, FileName *nameBuff) noexcept { +Error Directory::remove(PathIterator path, FileName *nameBuff) noexcept { // reuse nameBuff if it has already been allocated, as it is a rather large variable if (nameBuff == nullptr) { nameBuff = reinterpret_cast(ox_alloca(sizeof(FileName))); @@ -292,7 +292,7 @@ ox::Error Directory::remove(PathIterator path, FileName *n template template -ox::Error Directory::ls(F cb) noexcept { +Error Directory::ls(F cb) noexcept { oxTrace("ox::fs::Directory::ls"); auto buff = m_fs.read(m_inodeId).template to(); if (!buff.valid()) { diff --git a/deps/ox/src/ox/fs/filesystem/filelocation.hpp b/deps/ox/src/ox/fs/filesystem/filelocation.hpp index 62baa878..6dc7d031 100644 --- a/deps/ox/src/ox/fs/filesystem/filelocation.hpp +++ b/deps/ox/src/ox/fs/filesystem/filelocation.hpp @@ -23,7 +23,7 @@ enum class FileAddressType: int8_t { class FileAddress { template - friend ox::Error model(T*, FileAddress*); + friend Error model(T*, FileAddress*); public: static constexpr auto TypeName = "net.drinkingtea.ox.FileAddress"; @@ -95,7 +95,7 @@ class FileAddress { }; template -ox::Error model(T *io, FileAddress::Data *obj) { +Error model(T *io, FileAddress::Data *obj) { io->template setTypeInfo(); oxReturnError(io->field("path", SerStr(&obj->path))); oxReturnError(io->field("constPath", SerStr(&obj->path))); @@ -104,7 +104,7 @@ ox::Error model(T *io, FileAddress::Data *obj) { } template -ox::Error model(T *io, FileAddress *fa) { +Error model(T *io, FileAddress *fa) { io->template setTypeInfo(); oxReturnError(io->field("type", bit_cast(&fa->m_type))); oxReturnError(io->field("data", UnionView(&fa->m_data, static_cast(fa->m_type)))); diff --git a/deps/ox/src/ox/fs/filesystem/filesystem.cpp b/deps/ox/src/ox/fs/filesystem/filesystem.cpp index 751f8b8d..999779ba 100644 --- a/deps/ox/src/ox/fs/filesystem/filesystem.cpp +++ b/deps/ox/src/ox/fs/filesystem/filesystem.cpp @@ -58,7 +58,7 @@ Error FileSystem::remove(FileAddress addr, bool recursive) { } } -ox::Error FileSystem::write(FileAddress addr, void *buffer, uint64_t size, uint8_t fileType) { +Error FileSystem::write(FileAddress addr, void *buffer, uint64_t size, uint8_t fileType) { switch (addr.type()) { case FileAddressType::Inode: return write(addr.getInode().value, buffer, size, fileType); @@ -70,7 +70,7 @@ ox::Error FileSystem::write(FileAddress addr, void *buffer, uint64_t size, uint8 } } -ox::Result FileSystem::stat(FileAddress addr) { +Result FileSystem::stat(FileAddress addr) { switch (addr.type()) { case FileAddressType::Inode: return stat(addr.getInode().value); diff --git a/deps/ox/src/ox/fs/filesystem/filesystem.hpp b/deps/ox/src/ox/fs/filesystem/filesystem.hpp index 1fd12294..f44b1f93 100644 --- a/deps/ox/src/ox/fs/filesystem/filesystem.hpp +++ b/deps/ox/src/ox/fs/filesystem/filesystem.hpp @@ -72,7 +72,7 @@ class FileSystem { [[nodiscard]] virtual char *buff() = 0; - virtual Error walk(ox::Error(*cb)(uint8_t, uint64_t, uint64_t)) = 0; + virtual Error walk(Error(*cb)(uint8_t, uint64_t, uint64_t)) = 0; [[nodiscard]] virtual bool valid() const = 0; @@ -149,7 +149,7 @@ class FileSystemTemplate: public FileSystem { char *buff() override; - Error walk(ox::Error(*cb)(uint8_t, uint64_t, uint64_t)) override; + Error walk(Error(*cb)(uint8_t, uint64_t, uint64_t)) override; bool valid() const override; @@ -184,7 +184,7 @@ FileSystemTemplate::~FileSystemTemplate() { } template -ox::Error FileSystemTemplate::format(void *buff, uint64_t buffSize) { +Error FileSystemTemplate::format(void *buff, uint64_t buffSize) { oxReturnError(FileStore::format(buff, buffSize)); FileStore fs(buff, buffSize); @@ -206,7 +206,7 @@ ox::Error FileSystemTemplate::format(void *buff, uint64_t } template -ox::Error FileSystemTemplate::mkdir(const char *path, bool recursive) { +Error FileSystemTemplate::mkdir(const char *path, bool recursive) { oxTrace("ox::fs::FileSystemTemplate::mkdir") << "path:" << path << "recursive:" << recursive; auto rootDir = this->rootDir(); oxReturnError(rootDir.error); @@ -214,7 +214,7 @@ ox::Error FileSystemTemplate::mkdir(const char *path, bool } template -ox::Error FileSystemTemplate::move(const char *src, const char *dest) { +Error FileSystemTemplate::move(const char *src, const char *dest) { auto fd = fileSystemData(); oxReturnError(fd.error); Directory rootDir(m_fs, fd.value.rootDirInode); @@ -226,7 +226,7 @@ ox::Error FileSystemTemplate::move(const char *src, const } template -ox::Error FileSystemTemplate::read(const char *path, void *buffer, std::size_t buffSize) { +Error FileSystemTemplate::read(const char *path, void *buffer, std::size_t buffSize) { auto fd = fileSystemData(); oxReturnError(fd.error); Directory rootDir(m_fs, fd.value.rootDirInode); @@ -246,12 +246,12 @@ Result FileSystemTemplate::read(const char *path } template -ox::Error FileSystemTemplate::read(uint64_t inode, void *buffer, std::size_t buffSize) { +Error FileSystemTemplate::read(uint64_t inode, void *buffer, std::size_t buffSize) { return m_fs.read(inode, buffer, buffSize); } template -ox::Error FileSystemTemplate::read(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) { +Error FileSystemTemplate::read(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) { return m_fs.read(inode, readStart, readSize, reinterpret_cast(buffer), size); } @@ -266,7 +266,7 @@ Result FileSystemTemplate::read(uint64_t inode) template template -ox::Error FileSystemTemplate::ls(const char *path, F cb) { +Error FileSystemTemplate::ls(const char *path, F cb) { oxTrace("ox::FileSystemTemplate::ls") << "path:" << path; auto [s, err] = stat(path); oxReturnError(err); @@ -275,7 +275,7 @@ ox::Error FileSystemTemplate::ls(const char *path, F cb) { } template -ox::Error FileSystemTemplate::remove(const char *path, bool recursive) { +Error FileSystemTemplate::remove(const char *path, bool recursive) { auto fd = fileSystemData(); oxReturnError(fd.error); Directory rootDir(m_fs, fd.value.rootDirInode); @@ -297,18 +297,18 @@ ox::Error FileSystemTemplate::remove(const char *path, boo } template -ox::Error FileSystemTemplate::resize() { +Error FileSystemTemplate::resize() { return m_fs.resize(); } template -ox::Error FileSystemTemplate::resize(uint64_t size, void *buffer) { +Error FileSystemTemplate::resize(uint64_t size, void *buffer) { oxReturnError(m_fs.resize(size, buffer)); return OxError(0); } template -ox::Error FileSystemTemplate::write(const char *path, void *buffer, uint64_t size, uint8_t fileType) { +Error FileSystemTemplate::write(const char *path, void *buffer, uint64_t size, uint8_t fileType) { auto [inode, err] = find(path); if (err) { auto generated = m_fs.generateInodeId(); @@ -323,7 +323,7 @@ ox::Error FileSystemTemplate::write(const char *path, void } template -ox::Error FileSystemTemplate::write(uint64_t inode, void *buffer, uint64_t size, uint8_t fileType) { +Error FileSystemTemplate::write(uint64_t inode, void *buffer, uint64_t size, uint8_t fileType) { return m_fs.write(inode, buffer, size, fileType); } @@ -368,7 +368,7 @@ char *FileSystemTemplate::buff() { } template -ox::Error FileSystemTemplate::walk(ox::Error(*cb)(uint8_t, uint64_t, uint64_t)) { +Error FileSystemTemplate::walk(Error(*cb)(uint8_t, uint64_t, uint64_t)) { return m_fs.walk(cb); } diff --git a/deps/ox/src/ox/fs/filesystem/passthroughfs.cpp b/deps/ox/src/ox/fs/filesystem/passthroughfs.cpp index 9e17d5ef..02bf02b1 100644 --- a/deps/ox/src/ox/fs/filesystem/passthroughfs.cpp +++ b/deps/ox/src/ox/fs/filesystem/passthroughfs.cpp @@ -90,7 +90,7 @@ Error PassThroughFS::remove(const char *path, bool recursive) { } } -ox::Error PassThroughFS::resize(uint64_t, void*) { +Error PassThroughFS::resize(uint64_t, void*) { // unsupported return OxError(1); } diff --git a/deps/ox/src/ox/fs/filesystem/passthroughfs.hpp b/deps/ox/src/ox/fs/filesystem/passthroughfs.hpp index 3a98d4fb..b6b51f80 100644 --- a/deps/ox/src/ox/fs/filesystem/passthroughfs.hpp +++ b/deps/ox/src/ox/fs/filesystem/passthroughfs.hpp @@ -37,34 +37,34 @@ class PassThroughFS: public FileSystem { [[nodiscard]] std::string basePath(); - ox::Error mkdir(const char *path, bool recursive = false) override; + Error mkdir(const char *path, bool recursive = false) override; - ox::Error move(const char *src, const char *dest) override; + Error move(const char *src, const char *dest) override; - ox::Error read(const char *path, void *buffer, std::size_t buffSize) override; + Error read(const char *path, void *buffer, std::size_t buffSize) override; - ox::Result read(const char*) override; + Result read(const char*) override; - ox::Error read(uint64_t inode, void *buffer, std::size_t size) override; + Error read(uint64_t inode, void *buffer, std::size_t size) override; - ox::Error read(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) override; + Error read(uint64_t inode, std::size_t readStart, std::size_t readSize, void *buffer, std::size_t *size) override; - ox::Result read(uint64_t) override; + Result read(uint64_t) override; template - ox::Error ls(const char *dir, F cb); + Error ls(const char *dir, F cb); - ox::Error remove(const char *path, bool recursive = false) override; + Error remove(const char *path, bool recursive = false) override; - ox::Error resize(uint64_t size, void *buffer = nullptr) override; + Error resize(uint64_t size, void *buffer = nullptr) override; - ox::Error write(const char *path, void *buffer, uint64_t size, uint8_t fileType = FileType_NormalFile) override; + Error write(const char *path, void *buffer, uint64_t size, uint8_t fileType = FileType_NormalFile) override; - ox::Error write(uint64_t inode, void *buffer, uint64_t size, uint8_t fileType = FileType_NormalFile) override; + Error write(uint64_t inode, void *buffer, uint64_t size, uint8_t fileType = FileType_NormalFile) override; - ox::Result stat(uint64_t inode) override; + Result stat(uint64_t inode) override; - ox::Result stat(const char *path) override; + Result stat(const char *path) override; uint64_t spaceNeeded(uint64_t size) override; @@ -74,7 +74,7 @@ class PassThroughFS: public FileSystem { char *buff() override; - ox::Error walk(Error(*cb)(uint8_t, uint64_t, uint64_t)) override; + Error walk(Error(*cb)(uint8_t, uint64_t, uint64_t)) override; bool valid() const override; @@ -87,7 +87,7 @@ class PassThroughFS: public FileSystem { }; template -ox::Error PassThroughFS::ls(const char *dir, F cb) { +Error PassThroughFS::ls(const char *dir, F cb) { for (auto &p : std::filesystem::directory_iterator(m_path / stripSlash(dir))) { auto u8p = p.path().filename().u8string(); oxReturnError(cb(u8p.c_str(), 0)); diff --git a/deps/ox/src/ox/model/descwrite.hpp b/deps/ox/src/ox/model/descwrite.hpp index 9729c7e7..12a8ca47 100644 --- a/deps/ox/src/ox/model/descwrite.hpp +++ b/deps/ox/src/ox/model/descwrite.hpp @@ -143,7 +143,7 @@ class TypeDescWriter { // array handler template -ox::Error TypeDescWriter::field(const char *name, T *val, std::size_t) { +Error TypeDescWriter::field(const char *name, T *val, std::size_t) { if (m_type) { constexpr typename ox::remove_pointer::type *p = nullptr; bool alreadyExisted = false; @@ -159,7 +159,7 @@ ox::Error TypeDescWriter::field(const char *name, T *val, std::size_t) { } template -ox::Error TypeDescWriter::field(const char *name, T val) { +Error TypeDescWriter::field(const char *name, T val) { if (m_type) { bool alreadyExisted = false; const auto t = type(val, &alreadyExisted); @@ -171,7 +171,7 @@ ox::Error TypeDescWriter::field(const char *name, T val) { } template -ox::Error TypeDescWriter::field(const char *name, T *val) { +Error TypeDescWriter::field(const char *name, T *val) { if (m_type) { bool alreadyExisted = false; const auto t = type(val, &alreadyExisted); diff --git a/deps/ox/src/ox/model/optype.hpp b/deps/ox/src/ox/model/optype.hpp index 37829c3c..0af9a3a5 100644 --- a/deps/ox/src/ox/model/optype.hpp +++ b/deps/ox/src/ox/model/optype.hpp @@ -39,7 +39,7 @@ Error modelWriteDefinition(T*, O*) { template Error model(T *io, O *obj) { - ox::Error err; + Error err; if constexpr(ox_strcmp(T::opType(), ox::OpType::Read) == 0) { err = modelRead(io, obj); } else if constexpr(ox_strcmp(T::opType(), ox::OpType::Write) == 0) { diff --git a/deps/ox/src/ox/model/walk.hpp b/deps/ox/src/ox/model/walk.hpp index 671b28c6..a44bddd2 100644 --- a/deps/ox/src/ox/model/walk.hpp +++ b/deps/ox/src/ox/model/walk.hpp @@ -17,7 +17,7 @@ namespace ox { template class DataWalker { template - friend ox::Error parseField(const DescriptorField &field, ReaderBase *rdr, DataWalker *walker); + friend Error parseField(const DescriptorField &field, ReaderBase *rdr, DataWalker *walker); private: Vector m_typeStack; @@ -54,7 +54,7 @@ const DescriptorType *DataWalker::type() const noexcept { } template -ox::Error DataWalker::read(const DescriptorField &f, Reader *rdr) { +Error DataWalker::read(const DescriptorField &f, Reader *rdr) { // get const ref of paths const auto &pathCr = m_path; const auto &typePathCr = m_typePath; @@ -82,7 +82,7 @@ void DataWalker::popType() { } template -static ox::Error parseField(const DescriptorField &field, Reader *rdr, DataWalker *walker) { +static Error parseField(const DescriptorField &field, Reader *rdr, DataWalker *walker) { walker->pushNamePath(field.fieldName); if (field.subscriptLevels) { // add array handling @@ -131,7 +131,7 @@ static ox::Error parseField(const DescriptorField &field, Reader *rdr, DataWalke } template -ox::Error model(Reader *rdr, DataWalker *walker) { +Error model(Reader *rdr, DataWalker *walker) { auto type = walker->type(); if (!type) { return OxError(1); @@ -146,7 +146,7 @@ ox::Error model(Reader *rdr, DataWalker *walker) { } template -ox::Error walkModel(DescriptorType *type, uint8_t *data, std::size_t dataLen, Handler handler) { +Error walkModel(DescriptorType *type, uint8_t *data, std::size_t dataLen, Handler handler) { DataWalker walker(type, handler); Reader rdr(data, dataLen); return model(&rdr, &walker); diff --git a/deps/ox/src/ox/ptrarith/nodebuffer.hpp b/deps/ox/src/ox/ptrarith/nodebuffer.hpp index 7a1b53a1..18c09866 100644 --- a/deps/ox/src/ox/ptrarith/nodebuffer.hpp +++ b/deps/ox/src/ox/ptrarith/nodebuffer.hpp @@ -393,7 +393,7 @@ size_t NodeBuffer::spaceNeeded(size_t size) { template template -ox::Error NodeBuffer::compact(F cb) { +Error NodeBuffer::compact(F cb) { auto src = firstItem(); auto dest = ptr(sizeof(*this)); while (dest.offset() <= src.offset()) { diff --git a/deps/ox/src/ox/std/error.hpp b/deps/ox/src/ox/std/error.hpp index 156e0abb..769dd81d 100644 --- a/deps/ox/src/ox/std/error.hpp +++ b/deps/ox/src/ox/std/error.hpp @@ -49,7 +49,7 @@ struct [[nodiscard]] Error { }; constexpr Error _error(const char *file, uint32_t line, uint64_t errCode, const char *msg = nullptr) { - auto err = static_cast(errCode); + auto err = static_cast(errCode); err.file = file; err.line = line; err.msg = msg; @@ -92,12 +92,12 @@ struct [[nodiscard]] Result { namespace error { -constexpr Error toError(ox::Error e) noexcept { +constexpr Error toError(Error e) noexcept { return e; } template -constexpr Error toError(const ox::Result &ve) noexcept { +constexpr Error toError(const Result &ve) noexcept { return ve.error; }