drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 13 Activity

[ox] Rename ValErr to Result

Browse Source
This commit is contained in:
Gary Talent
2020-10-16 19:43:10 -05:00
parent faadcae7e9
commit 6b720042d0
23 changed files with 68 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
deps/ox/src/ox/claw/read.cpp vendored
View File

@@ -12,7 +12,7 @@ namespace ox {
namespace detail {
ValErr<ClawHeader> readHeader(const char *buff, std::size_t buffLen) noexcept {
Result<ClawHeader> readHeader(const char *buff, std::size_t buffLen) noexcept {
const auto s1End = ox_strchr(buff, ';', buffLen);
if (!s1End) {
return OxError(1);
@@ -57,7 +57,7 @@ ValErr<ClawHeader> readHeader(const char *buff, std::size_t buffLen) noexcept {
}
ValErr<Vector<char>> stripClawHeader(const char *buff, std::size_t buffLen) noexcept {
Result<Vector<char>> stripClawHeader(const char *buff, std::size_t buffLen) noexcept {
auto header = detail::readHeader(buff, buffLen);
oxReturnError(header);
Vector<char> out(header.value.dataSize);

4
deps/ox/src/ox/claw/read.hpp vendored
View File

@@ -27,11 +27,11 @@ struct ClawHeader {
std::size_t dataSize = 0;
};
ValErr<ClawHeader> readHeader(const char *buff, std::size_t buffLen) noexcept;
Result<ClawHeader> readHeader(const char *buff, std::size_t buffLen) noexcept;
}
ValErr<Vector<char>> stripClawHeader(const char *buff, std::size_t buffLen) noexcept;
Result<Vector<char>> stripClawHeader(const char *buff, std::size_t buffLen) noexcept;
template<typename T>
Error readClaw(char *buff, std::size_t buffLen, T *val) {

4
deps/ox/src/ox/claw/write.hpp vendored
View File

@@ -65,7 +65,7 @@ constexpr const char *getTypeName(T *t) noexcept {
}
template<typename T>
ValErr<String> writeClawHeader(T *t, ClawFormat fmt) noexcept {
Result<String> writeClawHeader(T *t, ClawFormat fmt) noexcept {
String out;
switch (fmt) {
case ClawFormat::Metal:
@@ -90,7 +90,7 @@ ValErr<String> writeClawHeader(T *t, ClawFormat fmt) noexcept {
}
template<typename T>
ValErr<Vector<char>> writeClaw(T *t, ClawFormat fmt) {
Result<Vector<char>> writeClaw(T *t, ClawFormat fmt) {
auto [header, headerErr] = detail::writeClawHeader(t, fmt);
oxReturnError(headerErr);
const auto [data, dataErr] = fmt == ClawFormat::Metal ? writeMC(t) : writeOC(t);