From 33018625ab919d66c93cbb8ba8a56e327a65f689 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Sat, 30 Jul 2016 11:02:43 -0700 Subject: [PATCH] Cleanup. --- include/bx/readerwriter.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/bx/readerwriter.h b/include/bx/readerwriter.h index bed18d0..47c5899 100644 --- a/include/bx/readerwriter.h +++ b/include/bx/readerwriter.h @@ -401,7 +401,7 @@ namespace bx } int64_t remainder = m_top-m_pos; - int32_t size = uint32_min(_size, int32_t(remainder > INT32_MAX ? INT32_MAX : remainder) ); + int32_t size = uint32_min(_size, uint32_t(int64_min(remainder, INT32_MAX) ) ); m_pos += size; if (size != _size) { @@ -454,7 +454,7 @@ namespace bx BX_CHECK(NULL != _err, "Reader/Writer interface calling functions must handle errors."); int64_t remainder = m_top-m_pos; - int32_t size = uint32_min(_size, int32_t(remainder > INT32_MAX ? INT32_MAX : remainder) ); + int32_t size = uint32_min(_size, uint32_t(int64_min(remainder, INT32_MAX) ) ); memcpy(_data, &m_data[m_pos], size); m_pos += size; if (size != _size) @@ -535,7 +535,7 @@ namespace bx } int64_t remainder = m_size-m_pos; - int32_t size = uint32_min(_size, int32_t(remainder > INT32_MAX ? INT32_MAX : remainder) ); + int32_t size = uint32_min(_size, uint32_t(int64_min(remainder, INT32_MAX) ) ); memcpy(&m_data[m_pos], _data, size); m_pos += size; m_top = int64_max(m_top, m_pos);