From d4e8f1222ca17b57ac74019b2fc3706e1192645c Mon Sep 17 00:00:00 2001 From: Wei Li Date: Mon, 21 Mar 2016 11:20:44 -0700 Subject: Re-enable several MSVC warnings Re-enable the following warnings: 4245: signed/unsigned conversion mismatch; 4310: cast may truncate data; 4389: operator on signed/unsigned mismatch; 4701: use potentially uninitialized local variable; 4706: assignment within conditional expression Clean up the code to avoid those warnings. BUG=pdfium:29 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1801383002 . --- core/fxcrt/fx_basic_wstring.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'core/fxcrt/fx_basic_wstring.cpp') diff --git a/core/fxcrt/fx_basic_wstring.cpp b/core/fxcrt/fx_basic_wstring.cpp index 95b761bd09..8282bd5014 100644 --- a/core/fxcrt/fx_basic_wstring.cpp +++ b/core/fxcrt/fx_basic_wstring.cpp @@ -640,13 +640,12 @@ FX_STRSIZE CFX_WideString::Replace(const FX_WCHAR* lpszOld, FX_STRSIZE nCount = 0; FX_WCHAR* lpszStart = m_pData->m_String; FX_WCHAR* lpszEnd = m_pData->m_String + m_pData->m_nDataLength; - FX_WCHAR* lpszTarget; - { - while ((lpszTarget = (FX_WCHAR*)FXSYS_wcsstr(lpszStart, lpszOld)) && - lpszStart < lpszEnd) { - nCount++; - lpszStart = lpszTarget + nSourceLen; - } + while (lpszStart < lpszEnd) { + FX_WCHAR* lpszTarget = FXSYS_wcsstr(lpszStart, lpszOld); + if (!lpszTarget) + break; + nCount++; + lpszStart = lpszTarget + nSourceLen; } if (nCount > 0) { CopyBeforeWrite(); @@ -667,9 +666,10 @@ FX_STRSIZE CFX_WideString::Replace(const FX_WCHAR* lpszOld, lpszStart = m_pData->m_String; lpszEnd = m_pData->m_String + std::max(m_pData->m_nDataLength, nNewLength); { - while ((lpszTarget = (FX_WCHAR*)FXSYS_wcsstr(lpszStart, lpszOld)) != - NULL && - lpszStart < lpszEnd) { + while (lpszStart < lpszEnd) { + FX_WCHAR* lpszTarget = FXSYS_wcsstr(lpszStart, lpszOld); + if (!lpszTarget) + break; FX_STRSIZE nBalance = nOldLength - (FX_STRSIZE)(lpszTarget - m_pData->m_String + nSourceLen); -- cgit v1.2.3