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 --- core/fxcrt/xml/cfx_xmlelement.cpp | 4 ++-- core/fxcrt/xml/cxml_parser.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'core/fxcrt/xml') diff --git a/core/fxcrt/xml/cfx_xmlelement.cpp b/core/fxcrt/xml/cfx_xmlelement.cpp index 8c2442e765..75bf9ee593 100644 --- a/core/fxcrt/xml/cfx_xmlelement.cpp +++ b/core/fxcrt/xml/cfx_xmlelement.cpp @@ -43,14 +43,14 @@ std::unique_ptr CFX_XMLElement::Clone() { CFX_WideString CFX_XMLElement::GetLocalTagName() const { FX_STRSIZE iFind = GetName().Find(L':', 0); - if (iFind < 0) + if (iFind == FX_STRNPOS) return GetName(); return GetName().Right(GetName().GetLength() - iFind - 1); } CFX_WideString CFX_XMLElement::GetNamespacePrefix() const { FX_STRSIZE iFind = GetName().Find(L':', 0); - if (iFind < 0) + if (iFind == FX_STRNPOS) return CFX_WideString(); return GetName().Left(iFind); } diff --git a/core/fxcrt/xml/cxml_parser.cpp b/core/fxcrt/xml/cxml_parser.cpp index 5ac1f82206..35eca527e6 100644 --- a/core/fxcrt/xml/cxml_parser.cpp +++ b/core/fxcrt/xml/cxml_parser.cpp @@ -83,7 +83,7 @@ void FX_XML_SplitQualifiedName(const CFX_ByteStringC& bsFullName, return; FX_STRSIZE iStart = bsFullName.Find(':'); - if (iStart == -1) { + if (iStart == FX_STRNPOS) { bsName = bsFullName; } else { bsSpace = bsFullName.Left(iStart); -- cgit v1.2.3