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

[ox] Remove OxError

Browse Source
This commit is contained in:
Gary Talent
2024-12-13 22:06:47 -06:00
parent 9881253f2a
commit 345fb03857
57 changed files with 383 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
deps/ox/src/ox/fs/filesystem/pathiterator.cpp vendored
View File

@@ -36,9 +36,9 @@ Error PathIterator::dirPath(char *out, std::size_t outSize) {
if (idx >= 0 && size < outSize) {
ox::memcpy(out, m_path, size);
out[size] = 0;
return OxError(0);
return ox::Error(0);
} else {
return OxError(1);
return ox::Error(1);
}
}
@@ -47,11 +47,11 @@ Error PathIterator::get(StringView &fileName) {
std::size_t size = 0;
if (m_iterator >= m_maxSize) {
oxTracef("ox.fs.PathIterator.get", "m_iterator ({}) >= m_maxSize ({})", m_iterator, m_maxSize);
return OxError(1);
return ox::Error(1);
}
if (!ox::strlen(&m_path[m_iterator])) {
oxTrace("ox.fs.PathIterator.get", "!ox::strlen(&m_path[m_iterator])");
return OxError(1);
return ox::Error(1);
}
auto start = m_iterator;
if (m_path[start] == '/') {
@@ -67,7 +67,7 @@ Error PathIterator::get(StringView &fileName) {
size = end - start;
// cannot fit the output in the output parameter
if (size >= MaxFileNameLength || size == 0) {
return OxError(1);
return ox::Error(1);
}
fileName = ox::substr(m_path, start, start + size);
// truncate trailing /
@@ -83,9 +83,9 @@ Error PathIterator::get(StringView &fileName) {
*/
Error PathIterator::next(StringView &fileName) {
std::size_t size = 0;
auto retval = OxError(1);
auto retval = ox::Error(1);
if (m_iterator < m_maxSize && ox::strlen(&m_path[m_iterator])) {
retval = OxError(0);
retval = ox::Error(0);
if (m_path[m_iterator] == '/') {
m_iterator++;
}
@@ -100,7 +100,7 @@ Error PathIterator::next(StringView &fileName) {
size = end - start;
// cannot fit the output in the output parameter
if (size >= MaxFileNameLength) {
return OxError(1);
return ox::Error(1);
}
fileName = ox::substr(m_path, start, start + size);
// truncate trailing /
@@ -115,10 +115,10 @@ Error PathIterator::next(StringView &fileName) {
Result<std::size_t> PathIterator::nextSize() const {
std::size_t size = 0;
auto retval = OxError(1);
auto retval = ox::Error(1);
auto it = m_iterator;
if (it < m_maxSize && ox::strlen(&m_path[it])) {
retval = OxError(0);
retval = ox::Error(0);
if (m_path[it] == '/') {
it++;
}