Amebis/stdex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stream: unify size method and make it const

Browse Source 
diag_file::size() was setting the m_state and returning 0 on error,
which violated original size() convention not to change stream state and
to return fsize_max on error.

Changing m_state prevented declaring size() method as const before.

cache::seek() was missing size() return value check.

Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2023-12-01 14:11:02 +01:00
parent 8fbbf58a1b
commit 976662415b
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
include/stdex/stream.hpp
View File

@ -901,7 +901,7 @@ namespace stdex
/// Returns file size /// Returns file size
/// Should the file size cannot be determined, the method returns fsize_max and it does not reset the state to failed. /// Should the file size cannot be determined, the method returns fsize_max and it does not reset the state to failed.
/// ///
virtual fsize_t size() = 0; virtual fsize_t size() const = 0;
/// ///
/// Sets file size - truncates the remainder of file content from the current file position to the end of file. /// Sets file size - truncates the remainder of file content from the current file position to the end of file.
@ -1779,7 +1779,7 @@ namespace stdex
m_state = state_t::fail; m_state = state_t::fail;
} }
virtual fsize_t size() virtual fsize_t size() const
{ {
return m_region.size(); return m_region.size();
} }
@ -2011,8 +2011,14 @@ namespace stdex
return m_offset = offset; return m_offset = offset;
case seek_t::cur: case seek_t::cur:
return m_offset += offset; return m_offset += offset;
case seek_t::end: case seek_t::end: {
return m_offset = size() + offset; auto n = size();
if (n == fsize_max) _Unlikely_{
m_state = state_t::fail;
return fpos_max;
}
return m_offset = n + offset;
}
default: default:
throw std::invalid_argument("unknown seek origin"); throw std::invalid_argument("unknown seek origin");
} }
@ -2035,7 +2041,7 @@ namespace stdex
m_state = m_source->state(); m_state = m_source->state();
} }
virtual fsize_t size() virtual fsize_t size() const
{ {
return m_cache.status != cache_t::cache_t::status_t::empty ? return m_cache.status != cache_t::cache_t::status_t::empty ?
std::max(m_source->size(), m_cache.region.end) : std::max(m_source->size(), m_cache.region.end) :
@ -2882,7 +2888,7 @@ namespace stdex
m_state = state_t::fail; m_state = state_t::fail;
} }
virtual fsize_t size() virtual fsize_t size() const
{ {
#ifdef _WIN32 #ifdef _WIN32
LARGE_INTEGER li; LARGE_INTEGER li;
@ -3752,7 +3758,7 @@ namespace stdex
return m_offset; return m_offset;
} }
virtual fsize_t size() virtual fsize_t size() const
{ {
return m_size; return m_size;
} }
@ -4150,19 +4156,14 @@ namespace stdex
} }
} }
virtual fsize_t size() virtual fsize_t size() const
{ {
if (m_files.empty()) { if (m_files.empty())
m_state = state_t::fail; return fsize_max;
return 0;
}
fsize_t result = m_files[0]->size(); fsize_t result = m_files[0]->size();
m_state = m_files[0]->state();
for (size_t i = 1, n = m_files.size(); i < n; ++i) { for (size_t i = 1, n = m_files.size(); i < n; ++i) {
if (m_files[i]->size() != result) if (m_files[i]->size() != result)
throw std::runtime_error("size mismatch"); throw std::runtime_error("size mismatch");
if (m_files[i]->state() != m_state)
throw std::runtime_error("state mismatch");
} }
return result; return result;
} }