From ebf2c3ad5bd1c4955d4b865359684507c362dae2 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Thu, 13 Feb 2020 15:41:20 +0100 Subject: [PATCH] No need to check if file has ended. --- server/TracyFileRead.hpp | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/server/TracyFileRead.hpp b/server/TracyFileRead.hpp index c72c6136..ed58a860 100644 --- a/server/TracyFileRead.hpp +++ b/server/TracyFileRead.hpp @@ -367,26 +367,19 @@ private: void ReadBlock( uint32_t sz ) { - if( m_dataOffset < m_dataSize ) + if( m_stream ) { - if( m_stream ) - { - m_lastBlock = (size_t)LZ4_decompress_safe_continue( m_stream, m_data + m_dataOffset, m_second, sz, BufSize ); - m_dataOffset += sz; - } - else - { - ZSTD_outBuffer out = { m_second, BufSize, 0 }; - ZSTD_inBuffer in = { m_data + m_dataOffset, sz, 0 }; - m_dataOffset += sz; - const auto ret = ZSTD_decompressStream( m_streamZstd, &out, &in ); - assert( ret > 0 ); - m_lastBlock = out.pos; - } + m_lastBlock = (size_t)LZ4_decompress_safe_continue( m_stream, m_data + m_dataOffset, m_second, sz, BufSize ); + m_dataOffset += sz; } else { - m_lastBlock = 0; + ZSTD_outBuffer out = { m_second, BufSize, 0 }; + ZSTD_inBuffer in = { m_data + m_dataOffset, sz, 0 }; + m_dataOffset += sz; + const auto ret = ZSTD_decompressStream( m_streamZstd, &out, &in ); + assert( ret > 0 ); + m_lastBlock = out.pos; } }