xfa/fxfa/fm2js/xfa_lexer.cpp - Issue 1919563002: Pass CFX_*StringCs to FX_HashCode_GETA and _GETW hash functions.

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: xfa/fxfa/fm2js/xfa_lexer.cpp

Issue 1919563002: Pass CFX_*StringCs to FX_HashCode_GETA and _GETW hash functions. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: win again again again Created 4 years, 8 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 side-by-side diff with in-line comments

Download patch

« xfa/fxfa/fm2js/xfa_fm2jscontext.cpp ('K') | « xfa/fxfa/fm2js/xfa_fm2jscontext.cpp ('k') | xfa/fxfa/fm2js/xfa_simpleexpression.cpp » ('j') | xfa/fxfa/parser/xfa_document_datamerger_imp.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: xfa/fxfa/fm2js/xfa_lexer.cpp

diff --git a/xfa/fxfa/fm2js/xfa_lexer.cpp b/xfa/fxfa/fm2js/xfa_lexer.cpp

index 4462bd5154bebff110db13976849104bfd326d10..394f5b51cb908f946c487458b511a045d773b377 100644

--- a/xfa/fxfa/fm2js/xfa_lexer.cpp

+++ b/xfa/fxfa/fm2js/xfa_lexer.cpp

@@ -516,13 +516,12 @@ void CXFA_FMLexer::Comment(const FX_WCHAR* p, const FX_WCHAR*& pEnd) {

}

XFA_FM_TOKEN CXFA_FMLexer::IsKeyword(const CFX_WideStringC& str) {

- int32_t iLength = str.GetLength();

- uint32_t uHash = FX_HashCode_String_GetW(str.c_str(), iLength, TRUE);

- int32_t iStart = KEYWORD_START, iEnd = KEYWORD_END;

- int32_t iMid = (iStart + iEnd) / 2;

+ uint32_t uHash = FX_HashCode_GetW(str, true);

+ int32_t iStart = KEYWORD_START;

+ int32_t iEnd = KEYWORD_END;

XFA_FMKeyword keyword;

do {

- iMid = (iStart + iEnd) / 2;

+ int32_t iMid = (iStart + iEnd) / 2;

keyword = keyWords[iMid];

if (uHash == keyword.m_uHash) {

return keyword.m_type;