core/src/fxcrt/fx_basic_wstring.cpp - Issue 733693003: Getting rid of more (FX_LPCWSTR) casts and fixing two bugs revealed by this.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: core/src/fxcrt/fx_basic_wstring.cpp

Issue 733693003: Getting rid of more (FX_LPCWSTR) casts and fixing two bugs revealed by this. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: Rebasing to latest origin/master. Created 6 years, 1 month 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 side-by-side diff with in-line comments

Download patch

Index: core/src/fxcrt/fx_basic_wstring.cpp

diff --git a/core/src/fxcrt/fx_basic_wstring.cpp b/core/src/fxcrt/fx_basic_wstring.cpp

index 3a13d5905438cfefa6b8888d71cb896a9f24cc40..0827fb6f3425568379c3c9b6ecd1f3eab61fcc37 100644

--- a/core/src/fxcrt/fx_basic_wstring.cpp

+++ b/core/src/fxcrt/fx_basic_wstring.cpp

@@ -586,7 +586,7 @@ FX_STRSIZE CFX_WideString::Find(FX_LPCWSTR lpszSub, FX_STRSIZE nStart) const

if (nLength < 1 || nStart > nLength) {

return -1;

}

- FX_LPCWSTR lpsz = (FX_LPCWSTR)FXSYS_wcsstr(m_pData->m_String + nStart, lpszSub);

+ FX_LPCWSTR lpsz = FXSYS_wcsstr(m_pData->m_String + nStart, lpszSub);

return (lpsz == NULL) ? -1 : (int)(lpsz - m_pData->m_String);

}

FX_STRSIZE CFX_WideString::Find(FX_WCHAR ch, FX_STRSIZE nStart) const

@@ -598,7 +598,7 @@ FX_STRSIZE CFX_WideString::Find(FX_WCHAR ch, FX_STRSIZE nStart) const

if (nStart >= nLength) {

return -1;

}

- FX_LPCWSTR lpsz = (FX_LPCWSTR)FXSYS_wcschr(m_pData->m_String + nStart, ch);

+ FX_LPCWSTR lpsz = FXSYS_wcschr(m_pData->m_String + nStart, ch);

return (lpsz == NULL) ? -1 : (int)(lpsz - m_pData->m_String);

}

void CFX_WideString::TrimRight(FX_LPCWSTR lpszTargetList)

« no previous file with comments | « core/src/fxcrt/fx_basic_buffer.cpp ('k') | core/src/fxcrt/fx_extension.cpp » ('j') | core/src/fxcrt/fx_xml_parser.cpp » ('J')