[ox] Cleanup
All checks were successful
Build / build (push) Successful in 1m11s

This commit is contained in:
2026-01-25 23:58:46 -06:00
parent 53aea9731d
commit 2ed469f2dd

View File

@@ -41,7 +41,7 @@ class OrganicClawWriter {
explicit OrganicClawWriter(Json::Value json, int unionIdx = -1) noexcept;
Error field(const char *key, int8_t const *val) noexcept {
Error field(CString const key, int8_t const *val) noexcept {
if (targetValid() && (*val || m_json.isArray())) {
value(key) = *val;
}
@@ -49,7 +49,7 @@ class OrganicClawWriter {
return {};
}
Error field(const char *key, int16_t const *val) noexcept {
Error field(CString const key, int16_t const *val) noexcept {
if (targetValid() && (*val || m_json.isArray())) {
value(key) = *val;
}
@@ -57,7 +57,7 @@ class OrganicClawWriter {
return {};
}
Error field(const char *key, int32_t const *val) noexcept {
Error field(CString const key, int32_t const *val) noexcept {
if (targetValid() && (*val || m_json.isArray())) {
value(key) = *val;
}
@@ -65,7 +65,7 @@ class OrganicClawWriter {
return {};
}
Error field(const char *key, int64_t const *val) noexcept {
Error field(CString const key, int64_t const *val) noexcept {
if (targetValid() && (*val || m_json.isArray())) {
value(key) = *val;
}
@@ -74,7 +74,7 @@ class OrganicClawWriter {
}
Error field(const char *key, uint8_t const *val) noexcept {
Error field(CString const key, uint8_t const *val) noexcept {
if (targetValid() && (*val || m_json.isArray())) {
value(key) = *val;
}
@@ -82,7 +82,7 @@ class OrganicClawWriter {
return {};
}
Error field(const char *key, uint16_t const *val) noexcept {
Error field(CString const key, uint16_t const *val) noexcept {
if (targetValid() && (*val || m_json.isArray())) {
value(key) = *val;
}
@@ -90,7 +90,7 @@ class OrganicClawWriter {
return {};
}
Error field(const char *key, uint32_t const *val) noexcept {
Error field(CString const key, uint32_t const *val) noexcept {
if (targetValid() && (*val || m_json.isArray())) {
value(key) = *val;
}
@@ -98,7 +98,7 @@ class OrganicClawWriter {
return {};
}
Error field(const char *key, uint64_t const *val) noexcept {
Error field(CString const key, uint64_t const *val) noexcept {
if (targetValid() && (*val || m_json.isArray())) {
value(key) = *val;
}
@@ -154,17 +154,17 @@ class OrganicClawWriter {
return {};
}
Error fieldCString(const char*, const char *const *val, int len) noexcept;
Error fieldCString(CString, CString const *val, int len) noexcept;
Error fieldCString(const char *name, const char *const*val) noexcept;
Error fieldCString(CString name, CString const*val) noexcept;
Error field(const char *key, UUID const *uuid) noexcept;
Error field(CString key, UUID const *uuid) noexcept;
template<typename T>
Error field(const char*, T const *val, size_t len) noexcept;
Error field(CString, T const *val, size_t len) noexcept;
template<typename T>
Error field(const char*, T const *val) noexcept;
Error field(CString, T const *val) noexcept;
template<typename T>
constexpr Error setTypeInfo(
@@ -194,12 +194,12 @@ class OrganicClawWriter {
}
[[nodiscard]]
Json::Value &value(const char *key) noexcept;
Json::Value &value(CString key) noexcept;
};
template<typename T>
Error OrganicClawWriter::field(const char *key, T const *val, size_t const len) noexcept {
Error OrganicClawWriter::field(CString key, T const *val, size_t const len) noexcept {
if (targetValid() && len) {
OrganicClawWriter w((Json::Value(Json::arrayValue)));
ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler{w};
@@ -215,7 +215,7 @@ OX_ALLOW_UNSAFE_BUFFERS_END
}
template<typename T>
Error OrganicClawWriter::field(const char *key, T const *val) noexcept {
Error OrganicClawWriter::field(CString key, T const *val) noexcept {
if constexpr(is_integer_v<T>) {
if (targetValid() && (*val || m_json.isArray())) {
// the int type needs to be normalized because jsoncpp doesn't
@@ -241,7 +241,7 @@ Error OrganicClawWriter::field(const char *key, T const *val) noexcept {
}
template<typename U, bool force>
Error OrganicClawWriter::field(const char *key, UnionView<U, force> val) noexcept {
Error OrganicClawWriter::field(CString key, UnionView<U, force> val) noexcept {
if (targetValid()) {
OrganicClawWriter w(val.idx());
ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler{w};