Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(215)

Side by Side Diff: core/fxcrt/fx_basic_wstring.cpp

Issue 1986533002: Fix the code that causes warnings (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « core/fpdfapi/fpdf_parser/cpdf_document.cpp ('k') | core/fxcrt/fx_basic_wstring_unittest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <cctype> 10 #include <cctype>
(...skipping 876 matching lines...) Expand 10 before | Expand all | Expand 10 after
887 if (!m_pData || pTargets.IsEmpty()) 887 if (!m_pData || pTargets.IsEmpty())
888 return; 888 return;
889 889
890 FX_STRSIZE len = GetLength(); 890 FX_STRSIZE len = GetLength();
891 if (len < 1) 891 if (len < 1)
892 return; 892 return;
893 893
894 FX_STRSIZE pos = 0; 894 FX_STRSIZE pos = 0;
895 while (pos < len) { 895 while (pos < len) {
896 FX_STRSIZE i = 0; 896 FX_STRSIZE i = 0;
897 while (i < pTargets.GetLength() && pTargets[i] != m_pData->m_String[pos]) { 897 while (i < pTargets.GetLength() &&
898 pTargets.CharAt(i) != m_pData->m_String[pos]) {
898 i++; 899 i++;
899 } 900 }
900 if (i == pTargets.GetLength()) { 901 if (i == pTargets.GetLength()) {
901 break; 902 break;
902 } 903 }
903 pos++; 904 pos++;
904 } 905 }
905 if (pos) { 906 if (pos) {
906 ReallocBeforeWrite(len); 907 ReallocBeforeWrite(len);
907 FX_STRSIZE nDataLength = len - pos; 908 FX_STRSIZE nDataLength = len - pos;
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
987 FXSYS_MultiByteToWideChar(codepage, 0, bstr.c_str(), src_len, nullptr, 0); 988 FXSYS_MultiByteToWideChar(codepage, 0, bstr.c_str(), src_len, nullptr, 0);
988 CFX_WideString wstr; 989 CFX_WideString wstr;
989 if (dest_len) { 990 if (dest_len) {
990 FX_WCHAR* dest_buf = wstr.GetBuffer(dest_len); 991 FX_WCHAR* dest_buf = wstr.GetBuffer(dest_len);
991 FXSYS_MultiByteToWideChar(codepage, 0, bstr.c_str(), src_len, dest_buf, 992 FXSYS_MultiByteToWideChar(codepage, 0, bstr.c_str(), src_len, dest_buf,
992 dest_len); 993 dest_len);
993 wstr.ReleaseBuffer(dest_len); 994 wstr.ReleaseBuffer(dest_len);
994 } 995 }
995 return wstr; 996 return wstr;
996 } 997 }
OLDNEW
« no previous file with comments | « core/fpdfapi/fpdf_parser/cpdf_document.cpp ('k') | core/fxcrt/fx_basic_wstring_unittest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698