diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2015-07-26 16:03:14 -0400 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2015-07-26 16:03:14 -0400 |
| commit | b7de164d6251dc066123b59bc15d30c74e920756 (patch) | |
| tree | 650e67242386d55616a2038c5cbc7042568ed377 /zinflate.cpp | |
| parent | 7b64ca489a7e1da36b02b4a35d149275914d8268 (diff) | |
| download | cryptopp-git-b7de164d6251dc066123b59bc15d30c74e920756.tar.gz | |
Cut-in CRYPTOPP_ASSERT in all remaining header and source files
Diffstat (limited to 'zinflate.cpp')
| -rw-r--r-- | zinflate.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/zinflate.cpp b/zinflate.cpp index e3fbdc57..ffc4b9df 100644 --- a/zinflate.cpp +++ b/zinflate.cpp @@ -30,20 +30,20 @@ inline bool LowFirstBitReader::FillBuffer(unsigned int length) m_buffer |= (unsigned long)b << m_bitsBuffered; m_bitsBuffered += 8; } - assert(m_bitsBuffered <= sizeof(unsigned long)*8); + CRYPTOPP_ASSERT(m_bitsBuffered <= sizeof(unsigned long)*8); return true; } inline unsigned long LowFirstBitReader::PeekBits(unsigned int length) { bool result = FillBuffer(length); - assert(result); CRYPTOPP_UNUSED(result); + CRYPTOPP_ASSERT(result); CRYPTOPP_UNUSED(result); return m_buffer & (((unsigned long)1 << length) - 1); } inline void LowFirstBitReader::SkipBits(unsigned int length) { - assert(m_bitsBuffered >= length); + CRYPTOPP_ASSERT(m_bitsBuffered >= length); m_buffer >>= length; m_bitsBuffered -= length; } @@ -137,7 +137,7 @@ void HuffmanDecoder::Initialize(const unsigned int *codeBits, unsigned int nCode m_cacheBits = STDMIN(9U, m_maxCodeBits); m_cacheMask = (1 << m_cacheBits) - 1; m_normalizedCacheMask = NormalizeCode(m_cacheMask, m_cacheBits); - assert(m_normalizedCacheMask == BitReverse(m_cacheMask)); + CRYPTOPP_ASSERT(m_normalizedCacheMask == BitReverse(m_cacheMask)); if (m_cache.size() != size_t(1) << m_cacheBits) m_cache.resize(1 << m_cacheBits); @@ -175,7 +175,7 @@ void HuffmanDecoder::FillCacheEntry(LookupEntry &entry, code_t normalizedCode) c inline unsigned int HuffmanDecoder::Decode(code_t code, /* out */ value_t &value) const { - assert(m_codeToValue.size() > 0); + CRYPTOPP_ASSERT(m_codeToValue.size() > 0); LookupEntry &entry = m_cache[code & m_cacheMask]; code_t normalizedCode; @@ -468,7 +468,7 @@ bool Inflator::DecodeBody() switch (m_blockType) { case 0: // stored - assert(m_reader.BitsBuffered() == 0); + CRYPTOPP_ASSERT(m_reader.BitsBuffered() == 0); while (!m_inQueue.IsEmpty() && !blockEnd) { size_t size; @@ -576,7 +576,7 @@ void Inflator::FlushOutput() { if (m_state != PRE_STREAM) { - assert(m_current >= m_lastFlush); + CRYPTOPP_ASSERT(m_current >= m_lastFlush); ProcessDecompressedData(m_window + m_lastFlush, m_current - m_lastFlush); m_lastFlush = m_current; } |