From fab012d3e7fba8011949f12832494defa4cfa0bd Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Fri, 23 May 2025 20:21:04 -0500 Subject: [PATCH] [ox] Cleanup all ox::Error(0) instances --- deps/ox/src/ox/claw/write.hpp | 2 +- deps/ox/src/ox/event/signal.hpp | 4 +-- .../src/ox/fs/filestore/filestoretemplate.hpp | 26 +++++++++---------- deps/ox/src/ox/fs/filesystem/filesystem.hpp | 8 +++--- .../ox/src/ox/fs/filesystem/passthroughfs.cpp | 6 ++--- .../ox/src/ox/fs/filesystem/passthroughfs.hpp | 2 +- deps/ox/src/ox/fs/filesystem/pathiterator.cpp | 6 ++--- deps/ox/src/ox/fs/ptrarith/nodebuffer.hpp | 6 ++--- deps/ox/src/ox/fs/tool.cpp | 4 +-- deps/ox/src/ox/mc/read.hpp | 16 ++++++------ deps/ox/src/ox/mc/write.hpp | 14 +++++----- deps/ox/src/ox/model/def.hpp | 2 +- deps/ox/src/ox/model/desctypes.hpp | 2 +- deps/ox/src/ox/model/descwrite.hpp | 6 ++--- deps/ox/src/ox/model/fieldcounter.hpp | 8 +++--- deps/ox/src/ox/model/modelops.hpp | 24 ++++++++--------- deps/ox/src/ox/model/modelvalue.cpp | 2 +- deps/ox/src/ox/model/modelvalue.hpp | 10 +++---- deps/ox/src/ox/model/typenamecatcher.hpp | 12 ++++----- deps/ox/src/ox/model/walk.hpp | 4 +-- deps/ox/src/ox/oc/read.cpp | 8 +++--- deps/ox/src/ox/oc/read.hpp | 12 ++++----- deps/ox/src/ox/oc/write.cpp | 2 +- deps/ox/src/ox/oc/write.hpp | 24 ++++++++--------- deps/ox/src/ox/std/string.hpp | 2 +- deps/ox/src/ox/std/vector.hpp | 2 +- 26 files changed, 107 insertions(+), 107 deletions(-) diff --git a/deps/ox/src/ox/claw/write.hpp b/deps/ox/src/ox/claw/write.hpp index d80c7067..8a62a1d0 100644 --- a/deps/ox/src/ox/claw/write.hpp +++ b/deps/ox/src/ox/claw/write.hpp @@ -39,7 +39,7 @@ struct TypeInfoCatcher { } constexpr Error field(...) noexcept { - return ox::Error(0); + return {}; } static constexpr auto opType() { diff --git a/deps/ox/src/ox/event/signal.hpp b/deps/ox/src/ox/event/signal.hpp index ac46e986..eb09f00b 100644 --- a/deps/ox/src/ox/event/signal.hpp +++ b/deps/ox/src/ox/event/signal.hpp @@ -218,7 +218,7 @@ Error Signal::emitCheckError(Args... args) const noexcept { for (auto &f : m_slots) { f->call(args...); } - return ox::Error(0); + return {}; } catch (const ox::Exception &ex) { return ox::Error(ex.errCode, ex.msg, ex.src); } @@ -410,7 +410,7 @@ Error Signal::emitCheckError(Args... args) const noexcept { for (auto &f : m_slots) { OX_RETURN_ERROR(f->call(ox::forward(args)...)); } - return ox::Error(0); + return {}; } } diff --git a/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp b/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp index dd757281..56e73372 100644 --- a/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp +++ b/deps/ox/src/ox/fs/filestore/filestoretemplate.hpp @@ -230,7 +230,7 @@ template Error FileStoreTemplate::incLinks(uint64_t id) { OX_REQUIRE_M(item, find(static_cast(id)).validate()); ++item->links; - return ox::Error(0); + return {}; } template @@ -240,7 +240,7 @@ Error FileStoreTemplate::decLinks(uint64_t id) { if (item->links == 0) { OX_RETURN_ERROR(remove(item)); } - return ox::Error(0); + return {}; } template @@ -298,7 +298,7 @@ Error FileStoreTemplate::write(uint64_t id64, const void *data, FsSize_t dest->id.get(), dest.offset(), destData.size()); fsData->rootNode = dest.offset(); oxTracef("ox.fs.FileStoreTemplate.write", "Root inode: {}", dest->id.get()); - return ox::Error(0); + return {}; } } else { oxTrace("ox.fs.FileStoreTemplate.write.fail", "Could not place item due to absence of FileStore header."); @@ -427,7 +427,7 @@ Error FileStoreTemplate::resize() { oxTracef("ox.fs.FileStoreTemplate.resize", "resize to: {}", newSize); OX_RETURN_ERROR(m_buffer->setSize(newSize)); oxTracef("ox.fs.FileStoreTemplate.resize", "resized to: {}", m_buffer->size()); - return ox::Error(0); + return {}; } template @@ -479,7 +479,7 @@ Error FileStoreTemplate::walk(Error(*cb)(uint8_t, uint64_t, uint64_t)) { for (auto i = m_buffer->iterator(); i.valid(); i.next()) { OX_RETURN_ERROR(cb(i->fileType, i.ptr().offset(), i.ptr().end())); } - return ox::Error(0); + return {}; } template @@ -503,7 +503,7 @@ Error FileStoreTemplate::compact() { return m_buffer->compact([this, &isFirstItem](uint64_t oldAddr, ItemPtr item) -> Error { if (isFirstItem) { isFirstItem = false; - return ox::Error(0); + return {}; } if (!item.valid()) { return ox::Error(1); @@ -524,7 +524,7 @@ Error FileStoreTemplate::compact() { parent->right = item; } } - return ox::Error(0); + return {}; }); } @@ -552,7 +552,7 @@ Error FileStoreTemplate::placeItem(ItemPtr item) { item->left = root->left; item->right = root->right; oxTracef("ox.fs.FileStoreTemplate.placeItem", "Overwrote Root Item: {}", item->id.get()); - return ox::Error(0); + return {}; } else { return placeItem(root, item); } @@ -573,7 +573,7 @@ Error FileStoreTemplate::placeItem(ItemPtr root, ItemPtr item, int depth item->right = right->right; } oxTracef("ox.fs.FileStoreTemplate.placeItem", "Placed Item: {}", item->id.get()); - return ox::Error(0); + return {}; } else { return placeItem(right, item, depth + 1); } @@ -586,7 +586,7 @@ Error FileStoreTemplate::placeItem(ItemPtr root, ItemPtr item, int depth item->right = left->right; } oxTracef("ox.fs.FileStoreTemplate.placeItem", "Placed Item: {}", item->id.get()); - return ox::Error(0); + return {}; } else { return placeItem(left, item, depth + 1); } @@ -624,7 +624,7 @@ Error FileStoreTemplate::unplaceItem(ItemPtr item) { } else { fsData->rootNode = 0; } - return ox::Error(0); + return {}; } else { return unplaceItem(root, item); } @@ -661,7 +661,7 @@ Error FileStoreTemplate::unplaceItem(ItemPtr root, ItemPtr item, int dep if (item->left) { OX_RETURN_ERROR(placeItem(m_buffer->ptr(item->left))); } - return ox::Error(0); + return {}; } template @@ -669,7 +669,7 @@ Error FileStoreTemplate::remove(ItemPtr item) { if (item.valid()) { OX_RETURN_ERROR(unplaceItem(item)); OX_RETURN_ERROR(m_buffer->free(item)); - return ox::Error(0); + return {}; } return ox::Error(1); } diff --git a/deps/ox/src/ox/fs/filesystem/filesystem.hpp b/deps/ox/src/ox/fs/filesystem/filesystem.hpp index fa378116..47fc0bb5 100644 --- a/deps/ox/src/ox/fs/filesystem/filesystem.hpp +++ b/deps/ox/src/ox/fs/filesystem/filesystem.hpp @@ -329,7 +329,7 @@ Error FileSystemTemplate::format(void *buff, uint64_t buff return ox::Error(1); } - return ox::Error(0); + return {}; } template @@ -346,7 +346,7 @@ Error FileSystemTemplate::move(StringViewCR src, StringVie OX_REQUIRE_M(inode, rootDir.find(src)); OX_RETURN_ERROR(rootDir.write(dest, inode)); OX_RETURN_ERROR(rootDir.remove(src)); - return ox::Error(0); + return {}; } template @@ -407,7 +407,7 @@ Error FileSystemTemplate::removePath(StringViewCR path, bo oxTrace("FileSystemTemplate.remove.fail", "Tried to remove directory without recursive setting."); return ox::Error(1); } - return ox::Error(0); + return {}; } template @@ -424,7 +424,7 @@ Result> FileSystemTemplate::ls(StringViewCR Vector out; OX_RETURN_ERROR(ls(path, [&out](StringViewCR name, typename FileStore::InodeId_t) { out.emplace_back(name); - return ox::Error(0); + return ox::Error{}; })); return out; } diff --git a/deps/ox/src/ox/fs/filesystem/passthroughfs.cpp b/deps/ox/src/ox/fs/filesystem/passthroughfs.cpp index d6f3cf98..f1f8d07c 100644 --- a/deps/ox/src/ox/fs/filesystem/passthroughfs.cpp +++ b/deps/ox/src/ox/fs/filesystem/passthroughfs.cpp @@ -60,7 +60,7 @@ Error PassThroughFS::move(StringViewCR src, StringViewCR dest) noexcept { if (ec.value()) { return ox::Error(1); } - return ox::Error(0); + return {}; } Result> PassThroughFS::ls(StringViewCR dir) const noexcept { @@ -148,7 +148,7 @@ Error PassThroughFS::readFilePath(StringViewCR path, void *buffer, std::size_t b oxTracef("ox.fs.PassThroughFS.read.error", "Read of {} failed: {}", path, f.what()); return ox::Error(2); } - return ox::Error(0); + return {}; } Error PassThroughFS::readFileInode(uint64_t, void*, std::size_t) noexcept { @@ -197,7 +197,7 @@ Error PassThroughFS::writeFilePath(StringViewCR path, const void *buffer, uint64 oxTracef("ox.fs.PassThroughFS.read.error", "Write of {} failed: {}", path, f.what()); return ox::Error(1); } - return ox::Error(0); + return {}; } Error PassThroughFS::writeFileInode(uint64_t, const void*, uint64_t, FileType) noexcept { diff --git a/deps/ox/src/ox/fs/filesystem/passthroughfs.hpp b/deps/ox/src/ox/fs/filesystem/passthroughfs.hpp index 4d9f255a..199bcc5b 100644 --- a/deps/ox/src/ox/fs/filesystem/passthroughfs.hpp +++ b/deps/ox/src/ox/fs/filesystem/passthroughfs.hpp @@ -99,7 +99,7 @@ Error PassThroughFS::ls(StringViewCR dir, F cb) const noexcept { for (auto &p : di) { OX_RETURN_ERROR(cb(p.path().filename().c_str(), 0)); } - return ox::Error(0); + return {}; } } diff --git a/deps/ox/src/ox/fs/filesystem/pathiterator.cpp b/deps/ox/src/ox/fs/filesystem/pathiterator.cpp index 07c5dec1..bd423833 100644 --- a/deps/ox/src/ox/fs/filesystem/pathiterator.cpp +++ b/deps/ox/src/ox/fs/filesystem/pathiterator.cpp @@ -36,7 +36,7 @@ Error PathIterator::dirPath(char *out, std::size_t outSize) { if (idx >= 0 && size < outSize) { ox::memcpy(out, m_path, size); out[size] = 0; - return ox::Error(0); + return {}; } else { return ox::Error(1); } @@ -85,7 +85,7 @@ Error PathIterator::next(StringView &fileName) { std::size_t size = 0; auto retval = ox::Error(1); if (m_iterator < m_maxSize && ox::strlen(&m_path[m_iterator])) { - retval = ox::Error(0); + retval = {}; if (m_path[m_iterator] == '/') { m_iterator++; } @@ -118,7 +118,7 @@ Result PathIterator::nextSize() const { auto retval = ox::Error(1); auto it = m_iterator; if (it < m_maxSize && ox::strlen(&m_path[it])) { - retval = ox::Error(0); + retval = {}; if (m_path[it] == '/') { it++; } diff --git a/deps/ox/src/ox/fs/ptrarith/nodebuffer.hpp b/deps/ox/src/ox/fs/ptrarith/nodebuffer.hpp index 7171a8a7..ac105e96 100644 --- a/deps/ox/src/ox/fs/ptrarith/nodebuffer.hpp +++ b/deps/ox/src/ox/fs/ptrarith/nodebuffer.hpp @@ -354,7 +354,7 @@ Error NodeBuffer::free(ItemPtr item) noexcept { } } m_header.bytesUsed -= item.size(); - return ox::Error(0); + return {}; } template @@ -370,7 +370,7 @@ Error NodeBuffer::setSize(std::size_t size) noexcept { m_header.size = static_cast(size); auto data = reinterpret_cast(this) + end; ox::memset(data, 0, size - end); - return ox::Error(0); + return {}; } } @@ -422,7 +422,7 @@ Error NodeBuffer::compact(F cb) noexcept { src = ptr(dest->next); dest = uninitializedPtr(dest.offset() + dest->fullSize()); } - return ox::Error(0); + return {}; } template diff --git a/deps/ox/src/ox/fs/tool.cpp b/deps/ox/src/ox/fs/tool.cpp index 82992968..af667354 100644 --- a/deps/ox/src/ox/fs/tool.cpp +++ b/deps/ox/src/ox/fs/tool.cpp @@ -48,7 +48,7 @@ static ox::Error runLs(ox::FileSystem *fs, ox::Span args) noexcept for (const auto &file : files) { oxOutf("{}\n", file); } - return ox::Error(0); + return {}; } static ox::Error runRead(ox::FileSystem *fs, ox::Span args) noexcept { @@ -60,7 +60,7 @@ static ox::Error runRead(ox::FileSystem *fs, ox::Span args) noexcep OX_ALLOW_UNSAFE_BUFFERS_BEGIN std::ignore = fwrite(buff.data(), sizeof(decltype(buff)::value_type), buff.size(), stdout); OX_ALLOW_UNSAFE_BUFFERS_END - return ox::Error(0); + return {}; } static ox::Error run(int argc, const char **argv) noexcept { diff --git a/deps/ox/src/ox/mc/read.hpp b/deps/ox/src/ox/mc/read.hpp index 282ce445..bbdfb6db 100644 --- a/deps/ox/src/ox/mc/read.hpp +++ b/deps/ox/src/ox/mc/read.hpp @@ -197,7 +197,7 @@ constexpr Error MetalClawReaderTemplate::field(const char*, bool *val) n OX_RETURN_ERROR(result); } ++m_field; - return ox::Error(0); + return {}; } // array handler @@ -256,7 +256,7 @@ constexpr Error MetalClawReaderTemplate::field(const char*, HashMap @@ -330,7 +330,7 @@ constexpr Error MetalClawReaderTemplate::field(const char*, BasicString< } } ++m_field; - return ox::Error(0); + return {}; } template @@ -370,7 +370,7 @@ constexpr Error MetalClawReaderTemplate::fieldCString(const char*, char data[size] = 0; } ++m_field; - return ox::Error(0); + return {}; } template @@ -388,7 +388,7 @@ constexpr Error MetalClawReaderTemplate::fieldCString(const char*, char data[size] = 0; } ++m_field; - return ox::Error(0); + return {}; } template @@ -416,7 +416,7 @@ constexpr Error MetalClawReaderTemplate::fieldCString(const char*, char } } ++m_field; - return ox::Error(0); + return {}; } template @@ -464,7 +464,7 @@ constexpr Error MetalClawReaderTemplate::readInteger(I *val) noexcept { } } ++m_field; - return ox::Error(0); + return {}; } template @@ -487,7 +487,7 @@ constexpr Error MetalClawReaderTemplate::field(const char*, CB cb) noexc } } ++m_field; - return ox::Error(0); + return {}; } template diff --git a/deps/ox/src/ox/mc/write.hpp b/deps/ox/src/ox/mc/write.hpp index abcb4c7f..dfab98c6 100644 --- a/deps/ox/src/ox/mc/write.hpp +++ b/deps/ox/src/ox/mc/write.hpp @@ -122,7 +122,7 @@ class MetalClawWriter { } OX_RETURN_ERROR(m_fieldPresence.set(static_cast(m_field), fieldSet)); ++m_field; - return ox::Error(0); + return {}; } }; @@ -184,7 +184,7 @@ constexpr Error MetalClawWriter::field(const char*, const bool *val) noe OX_RETURN_ERROR(m_fieldPresence.set(static_cast(m_field), *val)); } ++m_field; - return ox::Error(0); + return {}; } template @@ -201,7 +201,7 @@ constexpr Error MetalClawWriter::field(const char*, const BasicString(m_field), fieldSet)); ++m_field; - return ox::Error(0); + return {}; } template @@ -229,7 +229,7 @@ constexpr Error MetalClawWriter::fieldCString(const char*, const char *c } OX_RETURN_ERROR(m_fieldPresence.set(static_cast(m_field), fieldSet)); ++m_field; - return ox::Error(0); + return {}; } template @@ -255,7 +255,7 @@ constexpr Error MetalClawWriter::fieldCString(const char*, const char *v } OX_RETURN_ERROR(m_fieldPresence.set(static_cast(m_field), fieldSet)); ++m_field; - return ox::Error(0); + return {}; } template @@ -319,7 +319,7 @@ OX_ALLOW_UNSAFE_BUFFERS_END } OX_RETURN_ERROR(m_fieldPresence.set(static_cast(m_field), fieldSet)); ++m_field; - return ox::Error(0); + return {}; } template @@ -356,7 +356,7 @@ constexpr Error MetalClawWriter::field(const char*, const HashMap(m_field), fieldSet)); ++m_field; - return ox::Error(0); + return {}; } template diff --git a/deps/ox/src/ox/model/def.hpp b/deps/ox/src/ox/model/def.hpp index 4546f3c1..dcf2a12d 100644 --- a/deps/ox/src/ox/model/def.hpp +++ b/deps/ox/src/ox/model/def.hpp @@ -13,7 +13,7 @@ // oxModelFwdDecl is necessary because Apple-Clang is broken... #define OX_MODEL_FWD_DECL(modelName) constexpr ox::Error model(auto *io, ox::CommonPtrWith auto *o) noexcept #define OX_MODEL_BEGIN(modelName) constexpr ox::Error model(auto *io, [[maybe_unused]] ox::CommonPtrWith auto *o) noexcept { OX_RETURN_ERROR(io->template setTypeInfo()); -#define OX_MODEL_END() return ox::Error(0); } +#define OX_MODEL_END() return {}; } #define OX_MODEL_FIELD(fieldName) OX_RETURN_ERROR(io->field(#fieldName, &o->fieldName)); #define OX_MODEL_FIELD_RENAME(objFieldName, serFieldName) OX_RETURN_ERROR(io->field(#serFieldName, &o->objFieldName)); #define OX_MODEL_FRIEND(modelName) friend constexpr ox::Error model(auto *io, ox::CommonPtrWith auto *o) noexcept diff --git a/deps/ox/src/ox/model/desctypes.hpp b/deps/ox/src/ox/model/desctypes.hpp index 843c22f1..4bbb7367 100644 --- a/deps/ox/src/ox/model/desctypes.hpp +++ b/deps/ox/src/ox/model/desctypes.hpp @@ -244,7 +244,7 @@ constexpr Error model(TypeDescReader *io, CommonPtrWith auto // defaultValue is unused now, but placeholder for backwards compatibility int defaultValue = 0; oxReturnError(io->field("defaultValue", &defaultValue)); - return ox::Error(0); + return {}; } #endif diff --git a/deps/ox/src/ox/model/descwrite.hpp b/deps/ox/src/ox/model/descwrite.hpp index 4270871c..c07d494a 100644 --- a/deps/ox/src/ox/model/descwrite.hpp +++ b/deps/ox/src/ox/model/descwrite.hpp @@ -205,7 +205,7 @@ constexpr Error TypeDescWriter::field(StringViewCR name, T const*, std::size_t, const auto t = type(p); oxAssert(t != nullptr, "field(const char *name, T *val, std::size_t): Type not found or generated"); m_type->fieldList.emplace_back(t, String(name), detail::indirectionLevels_v + 1, subscriptStack, buildTypeId(*t)); - return ox::Error(0); + return {}; } return ox::Error(1); } @@ -220,7 +220,7 @@ constexpr Error TypeDescWriter::field(StringViewCR name, T const*, std::size_t) auto const lvls = detail::indirectionLevels_v + 1; SubscriptStack subscriptStack{lvls}; m_type->fieldList.emplace_back(t, String(name), lvls, subscriptStack, buildTypeId(*t)); - return ox::Error(0); + return {}; } return ox::Error(1); } @@ -231,7 +231,7 @@ constexpr Error TypeDescWriter::field(StringViewCR name, UnionView val const auto t = type(val); oxAssert(t != nullptr, "field(const char *name, T val): Type not found or generated"); m_type->fieldList.emplace_back(t, String(name), 0, SubscriptStack{}, ox::String(t->typeName)); - return ox::Error(0); + return {}; } return ox::Error(1); } diff --git a/deps/ox/src/ox/model/fieldcounter.hpp b/deps/ox/src/ox/model/fieldcounter.hpp index 206b6fcd..8b51d7d9 100644 --- a/deps/ox/src/ox/model/fieldcounter.hpp +++ b/deps/ox/src/ox/model/fieldcounter.hpp @@ -31,25 +31,25 @@ class FieldCounter { template constexpr ox::Error field(StringViewCR, U) noexcept { ++fields; - return ox::Error(0); + return {}; } template constexpr ox::Error field(StringViewCR, U, std::size_t) noexcept { ++fields; - return ox::Error(0); + return {}; } template constexpr Error field(StringViewCR, Handler) { ++fields; - return ox::Error(0); + return {}; } template constexpr Error fieldCString(Args&&...) noexcept { ++fields; - return ox::Error(0); + return {}; } static constexpr auto opType() noexcept { diff --git a/deps/ox/src/ox/model/modelops.hpp b/deps/ox/src/ox/model/modelops.hpp index 4f983561..bf562e9c 100644 --- a/deps/ox/src/ox/model/modelops.hpp +++ b/deps/ox/src/ox/model/modelops.hpp @@ -56,19 +56,19 @@ class MemberList { template constexpr Error field(const char*, T *v) noexcept { vars[m_i++] = static_cast(v); - return ox::Error(0); + return {}; } template constexpr Error field(const char*, T *v, int) noexcept { vars[m_i++] = static_cast(v); - return ox::Error(0); + return {}; } template constexpr Error field(const char*, UnionView u) noexcept { vars[m_i++] = static_cast(u.get()); - return ox::Error(0); + return {}; } template @@ -107,7 +107,7 @@ class Copier { auto &dst = *cbit_cast(m_dst->vars[m_i]); dst = src; ++m_i; - return ox::Error(0); + return {}; } } @@ -119,7 +119,7 @@ class Copier { dst = src; } ++m_i; - return ox::Error(0); + return {}; } template @@ -128,7 +128,7 @@ class Copier { auto &src = *u.get(); dst = src; ++m_i; - return ox::Error(0); + return {}; } template @@ -168,7 +168,7 @@ class Mover { dst = std::move(src); src = FT{}; ++m_i; - return ox::Error(0); + return {}; } } @@ -181,7 +181,7 @@ class Mover { src = FT{}; } ++m_i; - return ox::Error(0); + return {}; } template @@ -190,7 +190,7 @@ class Mover { auto &src = *u.get(); dst = std::move(src); ++m_i; - return ox::Error(0); + return {}; } template @@ -228,7 +228,7 @@ class Equals { const auto &dst = std::bit_cast(*m_other->vars[m_i]); ++m_i; if (dst == src) { - return ox::Error(0); + return {}; } else { this->value = false; return ox::Error(1); @@ -246,7 +246,7 @@ class Equals { } } ++m_i; - return ox::Error(0); + return {}; } template @@ -255,7 +255,7 @@ class Equals { const auto &src = *u.get(); ++m_i; if (dst == src) { - return ox::Error(0); + return {}; } else { this->value = false; return ox::Error(1); diff --git a/deps/ox/src/ox/model/modelvalue.cpp b/deps/ox/src/ox/model/modelvalue.cpp index 93744fb8..f735717e 100644 --- a/deps/ox/src/ox/model/modelvalue.cpp +++ b/deps/ox/src/ox/model/modelvalue.cpp @@ -18,6 +18,6 @@ static_assert([]() -> ox::Error { } //oxReturnError(v.set(5)); return {}; -}() == ox::Error(0)); +}() == ox::Error{}); } diff --git a/deps/ox/src/ox/model/modelvalue.hpp b/deps/ox/src/ox/model/modelvalue.hpp index 030f648a..28585c9e 100644 --- a/deps/ox/src/ox/model/modelvalue.hpp +++ b/deps/ox/src/ox/model/modelvalue.hpp @@ -972,7 +972,7 @@ constexpr Error model(auto *h, CommonPtrWith auto *obj) noexcept { for (auto &f : obj->m_fieldsOrder) { OX_RETURN_ERROR(h->field(f->name.c_str(), &f->value)); } - return ox::Error(0); + return {}; } constexpr Error model(auto *h, CommonPtrWith auto *obj) noexcept { @@ -981,7 +981,7 @@ constexpr Error model(auto *h, CommonPtrWith auto *obj) noexcept { for (auto &f : obj->m_fieldsOrder) { OX_RETURN_ERROR(h->field(f->name.c_str(), &f->value)); } - return ox::Error(0); + return {}; } constexpr ModelValue::ModelValue(const ModelValue &other) noexcept { @@ -1129,7 +1129,7 @@ constexpr Error ModelValue::setType( OX_RETURN_ERROR(m_data.uni->setType(type)); } oxAssert(m_type != Type::Undefined, "No type set"); - return ox::Error(0); + return {}; } template @@ -1184,7 +1184,7 @@ constexpr Error ModelValue::set(const T &v) noexcept { safeDelete(&value); } value = v; - return ox::Error(0); + return {}; } template @@ -1199,7 +1199,7 @@ constexpr Error ModelValue::set(T &&v) noexcept { safeDelete(&value); } value = std::move(v); - return ox::Error(0); + return {}; } constexpr ModelValue &ModelValue::operator=(ModelValue &other) noexcept { diff --git a/deps/ox/src/ox/model/typenamecatcher.hpp b/deps/ox/src/ox/model/typenamecatcher.hpp index 6d907c82..418a2e08 100644 --- a/deps/ox/src/ox/model/typenamecatcher.hpp +++ b/deps/ox/src/ox/model/typenamecatcher.hpp @@ -38,17 +38,17 @@ struct TypeNameCatcher { template constexpr Error field(const char*, T*, std::size_t) noexcept { - return ox::Error(0); + return {}; } template constexpr Error field(const char*, T) noexcept { - return ox::Error(0); + return {}; } template constexpr Error fieldCString(Args&&...) noexcept { - return ox::Error(0); + return {}; } static constexpr auto opType() noexcept { @@ -77,17 +77,17 @@ struct TypeInfoCatcher { template constexpr Error field(const char*, T*, std::size_t) noexcept { - return ox::Error(0); + return {}; } template constexpr Error field(const char*, T) noexcept { - return ox::Error(0); + return {}; } template constexpr Error fieldCString(const char*, T) noexcept { - return ox::Error(0); + return {}; } static constexpr auto opType() noexcept { diff --git a/deps/ox/src/ox/model/walk.hpp b/deps/ox/src/ox/model/walk.hpp index e92fdab2..e43cc2be 100644 --- a/deps/ox/src/ox/model/walk.hpp +++ b/deps/ox/src/ox/model/walk.hpp @@ -127,7 +127,7 @@ static constexpr Error parseField(const DescriptorField &field, Reader *rdr, Dat } } walker->popNamePath(); - return ox::Error(0); + return {}; } template @@ -141,7 +141,7 @@ constexpr Error model(Reader *rdr, DataWalker *walker) noexcept { for (const auto &field : fields) { OX_RETURN_ERROR(parseField(field, rdr, walker)); } - return ox::Error(0); + return {}; } template diff --git a/deps/ox/src/ox/oc/read.cpp b/deps/ox/src/ox/oc/read.cpp index a3a71e2e..38eb1a72 100644 --- a/deps/ox/src/ox/oc/read.cpp +++ b/deps/ox/src/ox/oc/read.cpp @@ -37,7 +37,7 @@ OrganicClawReader::OrganicClawReader(Json::Value json, int unionIdx) noexcept: } Error OrganicClawReader::field(const char *key, bool *val) noexcept { - auto err = ox::Error(0); + ox::Error err{}; if (targetValid()) { const auto &jv = value(key); if (jv.empty()) { @@ -53,7 +53,7 @@ Error OrganicClawReader::field(const char *key, bool *val) noexcept { } Error OrganicClawReader::fieldCString(const char *key, char *val, std::size_t buffLen) noexcept { - auto err = ox::Error(0); + ox::Error err{}; const char *begin = nullptr, *end = nullptr; const auto &jv = value(key); if (targetValid()) { @@ -81,7 +81,7 @@ Error OrganicClawReader::fieldCString(const char *key, char *val, std::size_t bu } Error OrganicClawReader::fieldCString(const char *key, char **val) noexcept { - auto err = ox::Error(0); + ox::Error err{}; const char *begin = nullptr, *end = nullptr; const auto &jv = value(key); auto &data = *val; @@ -106,7 +106,7 @@ Error OrganicClawReader::fieldCString(const char *key, char **val) noexcept { } Error OrganicClawReader::fieldCString(const char *key, char **val, std::size_t buffLen) noexcept { - auto err = ox::Error(0); + ox::Error err{}; const char *begin = nullptr, *end = nullptr; const auto &jv = value(key); if (targetValid()) { diff --git a/deps/ox/src/ox/oc/read.hpp b/deps/ox/src/ox/oc/read.hpp index bf449cd4..60593acb 100644 --- a/deps/ox/src/ox/oc/read.hpp +++ b/deps/ox/src/ox/oc/read.hpp @@ -137,7 +137,7 @@ class OrganicClawReader { template Error OrganicClawReader::field(const char *key, T *val) noexcept { - auto err = ox::Error(0); + ox::Error err{}; try { if constexpr (is_integer_v) { if (targetValid()) { @@ -190,7 +190,7 @@ Error OrganicClawReader::field(const char *key, T *val) noexcept { template Error OrganicClawReader::field(const char *key, UnionView val) noexcept { - auto err = ox::Error(0); + ox::Error err{}; if (targetValid()) { const auto &jv = value(key); if (jv.empty() || jv.isObject()) { @@ -207,7 +207,7 @@ Error OrganicClawReader::field(const char *key, UnionView val) noexcep template Error OrganicClawReader::field(const char *key, BasicString *val) noexcept { - auto err = ox::Error(0); + ox::Error err{}; if (targetValid()) { const auto &jv = value(key); if (jv.empty()) { @@ -224,7 +224,7 @@ Error OrganicClawReader::field(const char *key, BasicString *val) noexcept { template Error OrganicClawReader::field(const char *key, IString *val) noexcept { - auto err = ox::Error(0); + ox::Error err{}; if (targetValid()) { const auto &jv = value(key); if (jv.empty()) { @@ -257,7 +257,7 @@ OX_ALLOW_UNSAFE_BUFFERS_BEGIN OX_RETURN_ERROR(handler.field("", &val[i])); OX_ALLOW_UNSAFE_BUFFERS_END } - return ox::Error(0); + return {}; } template @@ -274,7 +274,7 @@ Error OrganicClawReader::field(const char *key, HashMap *val) noexcep const auto k = keys[i].c_str(); OX_RETURN_ERROR(handler.field(k, &val->operator[](k))); } - return ox::Error(0); + return {}; } Error readOC(BufferView buff, auto &val) noexcept { diff --git a/deps/ox/src/ox/oc/write.cpp b/deps/ox/src/ox/oc/write.cpp index 31770ac9..392cbf48 100644 --- a/deps/ox/src/ox/oc/write.cpp +++ b/deps/ox/src/ox/oc/write.cpp @@ -23,7 +23,7 @@ Error OrganicClawWriter::fieldCString(const char *key, const char *const*val, in value(key) = *val; } ++m_fieldIt; - return ox::Error(0); + return {}; } Error OrganicClawWriter::fieldCString(const char *key, const char *const*val) noexcept { diff --git a/deps/ox/src/ox/oc/write.hpp b/deps/ox/src/ox/oc/write.hpp index 37cbc6d0..f7358c1c 100644 --- a/deps/ox/src/ox/oc/write.hpp +++ b/deps/ox/src/ox/oc/write.hpp @@ -46,7 +46,7 @@ class OrganicClawWriter { value(key) = *val; } ++m_fieldIt; - return ox::Error(0); + return {}; } Error field(const char *key, const int16_t *val) noexcept { @@ -54,7 +54,7 @@ class OrganicClawWriter { value(key) = *val; } ++m_fieldIt; - return ox::Error(0); + return {}; } Error field(const char *key, const int32_t *val) noexcept { @@ -62,7 +62,7 @@ class OrganicClawWriter { value(key) = *val; } ++m_fieldIt; - return ox::Error(0); + return {}; } Error field(const char *key, const int64_t *val) noexcept { @@ -70,7 +70,7 @@ class OrganicClawWriter { value(key) = *val; } ++m_fieldIt; - return ox::Error(0); + return {}; } @@ -79,7 +79,7 @@ class OrganicClawWriter { value(key) = *val; } ++m_fieldIt; - return ox::Error(0); + return {}; } Error field(const char *key, const uint16_t *val) noexcept { @@ -87,7 +87,7 @@ class OrganicClawWriter { value(key) = *val; } ++m_fieldIt; - return ox::Error(0); + return {}; } Error field(const char *key, const uint32_t *val) noexcept { @@ -95,7 +95,7 @@ class OrganicClawWriter { value(key) = *val; } ++m_fieldIt; - return ox::Error(0); + return {}; } Error field(const char *key, const uint64_t *val) noexcept { @@ -103,7 +103,7 @@ class OrganicClawWriter { value(key) = *val; } ++m_fieldIt; - return ox::Error(0); + return {}; } Error field(char const*key, bool const*val) noexcept { @@ -151,7 +151,7 @@ class OrganicClawWriter { value(key) = val->c_str(); } ++m_fieldIt; - return ox::Error(0); + return {}; } Error fieldCString(const char*, const char *const*val, int len) noexcept; @@ -211,7 +211,7 @@ OX_ALLOW_UNSAFE_BUFFERS_END value(key) = w.m_json; } ++m_fieldIt; - return ox::Error(0); + return {}; } template @@ -237,7 +237,7 @@ Error OrganicClawWriter::field(const char *key, const T *val) noexcept { } } ++m_fieldIt; - return ox::Error(0); + return {}; } template @@ -251,7 +251,7 @@ Error OrganicClawWriter::field(const char *key, UnionView val) noexcep } } ++m_fieldIt; - return ox::Error(0); + return {}; } Result writeOC(const auto &val) noexcept { diff --git a/deps/ox/src/ox/std/string.hpp b/deps/ox/src/ox/std/string.hpp index 1dcb2842..615e6219 100644 --- a/deps/ox/src/ox/std/string.hpp +++ b/deps/ox/src/ox/std/string.hpp @@ -182,7 +182,7 @@ class BasicString { // make sure last element is a null terminator m_buff[currentLen + strLen] = 0; // this can't fail, but it returns an Error to match BString::append - return ox::Error(0); + return {}; } constexpr Error append(ox::StringView sv) noexcept { diff --git a/deps/ox/src/ox/std/vector.hpp b/deps/ox/src/ox/std/vector.hpp index a8868bdc..97b760f1 100644 --- a/deps/ox/src/ox/std/vector.hpp +++ b/deps/ox/src/ox/std/vector.hpp @@ -658,7 +658,7 @@ constexpr Error Vector::unordered_erase(std::size --m_size; m_items[pos] = std::move(m_items[m_size]); m_items[m_size].~T(); - return ox::Error(0); + return {}; } template