diff options
| author | Ryan Harrison <rharrison@chromium.org> | 2017-08-23 10:39:35 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-08-23 15:11:19 +0000 |
| commit | 12db7515f17228798d1aa38fce0fee3e7d2d36b6 (patch) | |
| tree | e291daf9e6a88ba0248670b9f1ba3a555f052538 /core/fxcrt/cfx_string_c_template.h | |
| parent | 3bb0a34cc75abe49a59c6390353957bbb5c5ab38 (diff) | |
| download | pdfium-12db7515f17228798d1aa38fce0fee3e7d2d36b6.tar.xz | |
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<FX_STRSIZE>, 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 <rharrison@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'core/fxcrt/cfx_string_c_template.h')
| -rw-r--r-- | core/fxcrt/cfx_string_c_template.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/core/fxcrt/cfx_string_c_template.h b/core/fxcrt/cfx_string_c_template.h index 99948e90a0..db8b274410 100644 --- a/core/fxcrt/cfx_string_c_template.h +++ b/core/fxcrt/cfx_string_c_template.h @@ -9,10 +9,12 @@ #include <algorithm> #include <type_traits> +#include <utility> #include <vector> #include "core/fxcrt/cfx_unowned_ptr.h" #include "core/fxcrt/fx_system.h" +#include "third_party/base/optional.h" #include "third_party/base/stl_util.h" // An immutable string with caller-provided storage which must outlive the @@ -129,12 +131,16 @@ class CFX_StringCTemplate { return static_cast<CharType>(m_Ptr.Get()[index]); } - FX_STRSIZE Find(CharType ch) const { + pdfium::Optional<FX_STRSIZE> Find(CharType ch) const { const UnsignedType* found = reinterpret_cast<const UnsignedType*>(FXSYS_chr( reinterpret_cast<const CharType*>(m_Ptr.Get()), ch, m_Length)); - return found ? found - m_Ptr.Get() : FX_STRNPOS; + + return found ? pdfium::Optional<FX_STRSIZE>(found - m_Ptr.Get()) + : pdfium::Optional<FX_STRSIZE>(); } + bool Contains(CharType ch) const { return Find(ch).has_value(); } + CFX_StringCTemplate Mid(FX_STRSIZE index, FX_STRSIZE count) const { ASSERT(count >= 0); if (index > m_Length) |