diff options
Diffstat (limited to 'core/fxcrt/cfx_bytestring.cpp')
-rw-r--r-- | core/fxcrt/cfx_bytestring.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/core/fxcrt/cfx_bytestring.cpp b/core/fxcrt/cfx_bytestring.cpp index e7e55de8e3..6e01933682 100644 --- a/core/fxcrt/cfx_bytestring.cpp +++ b/core/fxcrt/cfx_bytestring.cpp @@ -562,41 +562,41 @@ CFX_ByteString CFX_ByteString::Left(FX_STRSIZE nCount) const { FX_STRSIZE CFX_ByteString::Find(char ch, FX_STRSIZE nStart) const { if (!m_pData) - return -1; + return FX_STRNPOS; if (nStart < 0 || nStart >= m_pData->m_nDataLength) - return -1; + return FX_STRNPOS; const char* pStr = static_cast<const char*>( memchr(m_pData->m_String + nStart, ch, m_pData->m_nDataLength - nStart)); - return pStr ? pStr - m_pData->m_String : -1; + return pStr ? pStr - m_pData->m_String : FX_STRNPOS; } FX_STRSIZE CFX_ByteString::ReverseFind(char ch) const { if (!m_pData) - return -1; + return FX_STRNPOS; FX_STRSIZE nLength = m_pData->m_nDataLength; while (nLength--) { if (m_pData->m_String[nLength] == ch) return nLength; } - return -1; + return FX_STRNPOS; } FX_STRSIZE CFX_ByteString::Find(const CFX_ByteStringC& pSub, FX_STRSIZE nStart) const { if (!m_pData) - return -1; + return FX_STRNPOS; FX_STRSIZE nLength = m_pData->m_nDataLength; if (nStart > nLength) - return -1; + return FX_STRNPOS; const char* pStr = FX_strstr(m_pData->m_String + nStart, m_pData->m_nDataLength - nStart, pSub.unterminated_c_str(), pSub.GetLength()); - return pStr ? (int)(pStr - m_pData->m_String) : -1; + return pStr ? (int)(pStr - m_pData->m_String) : FX_STRNPOS; } void CFX_ByteString::MakeLower() { |