From 12db7515f17228798d1aa38fce0fee3e7d2d36b6 Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Wed, 23 Aug 2017 10:39:35 -0400 Subject: Convert string Find methods to return an Optional The Find and ReverseFind methods for WideString, WideStringC, ByteString, and ByteStringC have been converted from returning a raw FX_STRSIZE, to returning Optional, so that success/failure can be indicated without using FX_STRNPOS. This allows for removing FX_STRNPOS and by association makes the conversion of FX_STRSIZE to size_t easier, since it forces checking the return value of Find to be explictly done as well as taking the error value out of the range of FX_STRSIZE. New Contains methods have been added for cases where the success or failure is all the call site to Find cared about, and the actual position was ignored. BUG=pdfium:828 Change-Id: Id827e508c8660affa68cc08a13d96121369364b7 Reviewed-on: https://pdfium-review.googlesource.com/11350 Commit-Queue: Ryan Harrison Reviewed-by: dsinclair --- core/fxcrt/xml/cfx_xmlelement.cpp | 14 ++++++-------- core/fxcrt/xml/cxml_parser.cpp | 8 ++++---- 2 files changed, 10 insertions(+), 12 deletions(-) (limited to 'core/fxcrt/xml') diff --git a/core/fxcrt/xml/cfx_xmlelement.cpp b/core/fxcrt/xml/cfx_xmlelement.cpp index 75bf9ee593..eb60e68893 100644 --- a/core/fxcrt/xml/cfx_xmlelement.cpp +++ b/core/fxcrt/xml/cfx_xmlelement.cpp @@ -42,17 +42,15 @@ std::unique_ptr CFX_XMLElement::Clone() { } CFX_WideString CFX_XMLElement::GetLocalTagName() const { - FX_STRSIZE iFind = GetName().Find(L':', 0); - if (iFind == FX_STRNPOS) - return GetName(); - return GetName().Right(GetName().GetLength() - iFind - 1); + auto pos = GetName().Find(L':'); + return pos.has_value() + ? GetName().Right(GetName().GetLength() - pos.value() - 1) + : GetName(); } CFX_WideString CFX_XMLElement::GetNamespacePrefix() const { - FX_STRSIZE iFind = GetName().Find(L':', 0); - if (iFind == FX_STRNPOS) - return CFX_WideString(); - return GetName().Left(iFind); + auto pos = GetName().Find(L':'); + return pos.has_value() ? GetName().Left(pos.value()) : CFX_WideString(); } CFX_WideString CFX_XMLElement::GetNamespaceURI() const { diff --git a/core/fxcrt/xml/cxml_parser.cpp b/core/fxcrt/xml/cxml_parser.cpp index ebd5873b33..18103dfc5e 100644 --- a/core/fxcrt/xml/cxml_parser.cpp +++ b/core/fxcrt/xml/cxml_parser.cpp @@ -82,12 +82,12 @@ void FX_XML_SplitQualifiedName(const CFX_ByteStringC& bsFullName, if (bsFullName.IsEmpty()) return; - FX_STRSIZE iStart = bsFullName.Find(':'); - if (iStart == FX_STRNPOS) { + auto iStart = bsFullName.Find(':'); + if (!iStart.has_value()) { bsName = bsFullName; } else { - bsSpace = bsFullName.Left(iStart); - bsName = bsFullName.Right(bsFullName.GetLength() - (iStart + 1)); + bsSpace = bsFullName.Left(iStart.value()); + bsName = bsFullName.Right(bsFullName.GetLength() - (iStart.value() + 1)); } } -- cgit v1.2.3