[ox] Cleanup

This commit is contained in:
2024-04-18 19:23:32 -05:00
parent 2c0e02277c
commit a20d7fd923
27 changed files with 174 additions and 150 deletions

View File

@@ -13,7 +13,7 @@
namespace ox {
Result<ClawHeader> readClawHeader(const char *buff, std::size_t buffLen) noexcept {
const auto s1End = ox_strchr(buff, ';', buffLen);
const auto s1End = ox::strchr(buff, ';', buffLen);
if (!s1End) {
return OxError(1, "Could not read Claw header");
}
@@ -22,7 +22,7 @@ Result<ClawHeader> readClawHeader(const char *buff, std::size_t buffLen) noexcep
buff += s1Size + 1;
buffLen -= s1Size + 1;
const auto s2End = ox_strchr(buff, ';', buffLen);
const auto s2End = ox::strchr(buff, ';', buffLen);
if (!s2End) {
return OxError(2, "Could not read Claw header");
}
@@ -31,7 +31,7 @@ Result<ClawHeader> readClawHeader(const char *buff, std::size_t buffLen) noexcep
buff += s2Size + 1;
buffLen -= s2Size + 1;
const auto s3End = ox_strchr(buff, ';', buffLen);
const auto s3End = ox::strchr(buff, ';', buffLen);
if (!s3End) {
return OxError(3, "Could not read Claw header");
}
@@ -49,7 +49,7 @@ Result<ClawHeader> readClawHeader(const char *buff, std::size_t buffLen) noexcep
return OxError(4, "Claw format does not match any supported format/version combo");
}
hdr.typeName = typeName;
if (auto r = ox_atoi(versionStr.c_str()); r.error == 0) {
if (auto r = ox::atoi(versionStr.c_str()); r.error == 0) {
hdr.typeVersion = r.value;
}
hdr.data = buff;