From da129ab38c3fb6ed3de85ffb6f8938eb31130a53 Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Tue, 1 Aug 2017 15:16:59 -0400 Subject: Replace raw value for constant error value in string operations Currently Find() and other methods that return a FX_STRSIZE return -1 to indicate error/failure. This means that there is a lot of magic numbers and magic checks floating around. The standard library for similar operations uses a npos constant. This CL implements FX_STRNPOS, and replaces usages of magic number checking. It also does some type cleanup along the way where it was obvious that FX_STRSIZE should be being used. Removing the magic numbers should make eventually changing FX_STRSIZE to be unsigned easier in the future. BUG=pdfium:828 Change-Id: I67e481e44cf2f75a1698afa8fbee4f375a74c490 Reviewed-on: https://pdfium-review.googlesource.com/9651 Commit-Queue: Ryan Harrison Reviewed-by: Tom Sepez --- xfa/fxfa/cxfa_pdffontmgr.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'xfa/fxfa/cxfa_pdffontmgr.cpp') diff --git a/xfa/fxfa/cxfa_pdffontmgr.cpp b/xfa/fxfa/cxfa_pdffontmgr.cpp index 77c4433f98..6e7a2ede4b 100644 --- a/xfa/fxfa/cxfa_pdffontmgr.cpp +++ b/xfa/fxfa/cxfa_pdffontmgr.cpp @@ -120,9 +120,9 @@ bool CXFA_PDFFontMgr::PsNameMatchDRFontName(const CFX_ByteStringC& bsPsName, bool bStrictMatch) { CFX_ByteString bsDRName = bsDRFontName; bsDRName.Remove('-'); - int32_t iPsLen = bsPsName.GetLength(); - int32_t nIndex = bsDRName.Find(bsPsName); - if (nIndex != -1 && !bStrictMatch) + FX_STRSIZE iPsLen = bsPsName.GetLength(); + FX_STRSIZE nIndex = bsDRName.Find(bsPsName); + if (nIndex != FX_STRNPOS && !bStrictMatch) return true; if (nIndex != 0) @@ -130,8 +130,8 @@ bool CXFA_PDFFontMgr::PsNameMatchDRFontName(const CFX_ByteStringC& bsPsName, int32_t iDifferLength = bsDRName.GetLength() - iPsLen; if (iDifferLength > 1 || (bBold || bItalic)) { - int32_t iBoldIndex = bsDRName.Find("Bold"); - bool bBoldFont = iBoldIndex > 0; + FX_STRSIZE iBoldIndex = bsDRName.Find("Bold"); + bool bBoldFont = iBoldIndex != FX_STRNPOS; if (bBold != bBoldFont) return false; @@ -140,11 +140,11 @@ bool CXFA_PDFFontMgr::PsNameMatchDRFontName(const CFX_ByteStringC& bsPsName, std::min(iDifferLength - 4, bsDRName.GetLength() - iBoldIndex - 4); } bool bItalicFont = true; - if (bsDRName.Find("Italic") > 0) { + if (bsDRName.Find("Italic") != FX_STRNPOS) { iDifferLength -= 6; - } else if (bsDRName.Find("It") > 0) { + } else if (bsDRName.Find("It") != FX_STRNPOS) { iDifferLength -= 2; - } else if (bsDRName.Find("Oblique") > 0) { + } else if (bsDRName.Find("Oblique") != FX_STRNPOS) { iDifferLength -= 7; } else { bItalicFont = false; -- cgit v1.2.3