diff options
| author | Ryan Harrison <rharrison@chromium.org> | 2017-08-01 15:16:59 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-08-01 19:35:49 +0000 |
| commit | da129ab38c3fb6ed3de85ffb6f8938eb31130a53 (patch) | |
| tree | 1ed3980d91ae9258f917124d69f0276260e34b71 /core/fxcrt/cfx_widestring_unittest.cpp | |
| parent | de7c9620c37486413e1f7db4567b4b0cea6a857f (diff) | |
| download | pdfium-da129ab38c3fb6ed3de85ffb6f8938eb31130a53.tar.xz | |
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 <rharrison@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fxcrt/cfx_widestring_unittest.cpp')
| -rw-r--r-- | core/fxcrt/cfx_widestring_unittest.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/fxcrt/cfx_widestring_unittest.cpp b/core/fxcrt/cfx_widestring_unittest.cpp index 1d6d110497..a53e9a35e2 100644 --- a/core/fxcrt/cfx_widestring_unittest.cpp +++ b/core/fxcrt/cfx_widestring_unittest.cpp @@ -853,22 +853,22 @@ TEST(fxcrt, WideStringCOperatorNE) { TEST(fxcrt, WideStringCFind) { CFX_WideStringC null_string; - EXPECT_EQ(-1, null_string.Find(L'a')); - EXPECT_EQ(-1, null_string.Find(0)); + EXPECT_EQ(FX_STRNPOS, null_string.Find(L'a')); + EXPECT_EQ(FX_STRNPOS, null_string.Find(0)); CFX_WideStringC empty_string(L""); - EXPECT_EQ(-1, empty_string.Find(L'a')); - EXPECT_EQ(-1, empty_string.Find(0)); + EXPECT_EQ(FX_STRNPOS, empty_string.Find(L'a')); + EXPECT_EQ(FX_STRNPOS, empty_string.Find(0)); CFX_WideStringC single_string(L"a"); EXPECT_EQ(0, single_string.Find(L'a')); - EXPECT_EQ(-1, single_string.Find(L'b')); - EXPECT_EQ(-1, single_string.Find(0)); + EXPECT_EQ(FX_STRNPOS, single_string.Find(L'b')); + EXPECT_EQ(FX_STRNPOS, single_string.Find(0)); CFX_WideStringC longer_string(L"abccc"); EXPECT_EQ(0, longer_string.Find(L'a')); EXPECT_EQ(2, longer_string.Find(L'c')); - EXPECT_EQ(-1, longer_string.Find(0)); + EXPECT_EQ(FX_STRNPOS, longer_string.Find(0)); CFX_WideStringC hibyte_string( L"ab\xff08" |