From 15c0fccfeff5bf389b494a828c89adb3207c73d6 Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Mon, 12 Mar 2018 15:20:04 +0000 Subject: Remove all usages of FXSYS_iswASCIIalnum Instances are either replaced with FXSYS_iswalnum, which calls out to the ICU library to do the proper Unicode operations, or have been converted to a isascii && isalnum pair, if ASCII alnum is actually what was wanted. BUG=pdfium:1035 Change-Id: I959ec8739a4d020e61562180393ab8113a81577c Reviewed-on: https://pdfium-review.googlesource.com/28430 Reviewed-by: dsinclair Commit-Queue: Ryan Harrison --- fxjs/cjs_publicmethods.cpp | 2 +- fxjs/cjs_util.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'fxjs') diff --git a/fxjs/cjs_publicmethods.cpp b/fxjs/cjs_publicmethods.cpp index 28df0a305b..81a84d286b 100644 --- a/fxjs/cjs_publicmethods.cpp +++ b/fxjs/cjs_publicmethods.cpp @@ -285,7 +285,7 @@ bool CJS_PublicMethods::MaskSatisfied(wchar_t c_Change, wchar_t c_Mask) { case L'A': return FXSYS_iswASCIIalpha(c_Change); case L'O': - return FXSYS_iswASCIIalnum(c_Change); + return isascii(c_Change) && isalnum(c_Change); case L'X': return true; default: diff --git a/fxjs/cjs_util.cpp b/fxjs/cjs_util.cpp index d552fcdf34..d73c238488 100644 --- a/fxjs/cjs_util.cpp +++ b/fxjs/cjs_util.cpp @@ -311,7 +311,7 @@ WideString CJS_Util::printx(const WideString& wsFormat, } break; case 'X': { if (iSourceIdx < wsSource.GetLength()) { - if (FXSYS_iswASCIIalnum(wsSource[iSourceIdx])) { + if (isascii(wsSource[iSourceIdx]) && isalnum(wsSource[iSourceIdx])) { wsResult += TranslateCase(wsSource[iSourceIdx], eCaseMode); ++iFormatIdx; } -- cgit v1.2.3