From 735eda96cf24349d10b160c8f5bd363b73d8aba1 Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Mon, 12 Mar 2018 15:44:36 +0000 Subject: Remove all usages of FXSYS_iswASCIIalpha Instances are either replaced with FXSYS_iswalpha, which calls out to the ICU library to do the proper Unicode operations, or have been converted to a isascii && isalpha pair, if ASCII alpha is actually what was wanted. BUG=pdfium:1035 Change-Id: I971ff639ee1ff818ad08793a1900a8bcbb0a3e04 Reviewed-on: https://pdfium-review.googlesource.com/28450 Reviewed-by: dsinclair Commit-Queue: Ryan Harrison --- xfa/fgas/crt/cfgas_formatstring.cpp | 8 ++++---- xfa/fxfa/fm2js/cxfa_fmlexer.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'xfa') diff --git a/xfa/fgas/crt/cfgas_formatstring.cpp b/xfa/fgas/crt/cfgas_formatstring.cpp index e4185b83c9..d7273d0e4a 100644 --- a/xfa/fgas/crt/cfgas_formatstring.cpp +++ b/xfa/fgas/crt/cfgas_formatstring.cpp @@ -1096,7 +1096,7 @@ bool CFGAS_FormatString::ParseText(const WideString& wsSrcText, break; } case 'A': - if (FXSYS_iswASCIIalpha(pStrText[iText])) { + if (FXSYS_iswalpha(pStrText[iText])) { *wsValue += pStrText[iText]; iText++; } @@ -1110,7 +1110,7 @@ bool CFGAS_FormatString::ParseText(const WideString& wsSrcText, case 'O': case '0': if (FXSYS_isDecimalDigit(pStrText[iText]) || - FXSYS_iswASCIIalpha(pStrText[iText])) { + FXSYS_iswalpha(pStrText[iText])) { *wsValue += pStrText[iText]; iText++; } @@ -1815,7 +1815,7 @@ bool CFGAS_FormatString::FormatText(const WideString& wsSrcText, break; } case 'A': - if (iText >= iLenText || !FXSYS_iswASCIIalpha(pStrText[iText])) + if (iText >= iLenText || !FXSYS_iswalpha(pStrText[iText])) return false; *wsOutput += pStrText[iText++]; @@ -1831,7 +1831,7 @@ bool CFGAS_FormatString::FormatText(const WideString& wsSrcText, case 'O': case '0': if (iText >= iLenText || (!FXSYS_isDecimalDigit(pStrText[iText]) && - !FXSYS_iswASCIIalpha(pStrText[iText]))) { + !FXSYS_iswalpha(pStrText[iText]))) { return false; } *wsOutput += pStrText[iText++]; diff --git a/xfa/fxfa/fm2js/cxfa_fmlexer.cpp b/xfa/fxfa/fm2js/cxfa_fmlexer.cpp index 4dc8788a1a..3559fb7aeb 100644 --- a/xfa/fxfa/fm2js/cxfa_fmlexer.cpp +++ b/xfa/fxfa/fm2js/cxfa_fmlexer.cpp @@ -306,7 +306,7 @@ CXFA_FMToken CXFA_FMLexer::AdvanceForNumber() { wchar_t* end = nullptr; if (m_cursor) wcstod(const_cast(m_cursor), &end); - if (!end || FXSYS_iswASCIIalpha(*end)) { + if (!end || FXSYS_iswalpha(*end)) { RaiseError(); return CXFA_FMToken(); } -- cgit v1.2.3