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 /fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.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 'fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp')
| -rw-r--r-- | fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp index 052bed55d2..7cccd2fb11 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp +++ b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp @@ -809,19 +809,19 @@ bool CPDFXFA_DocEnvironment::ExportSubmitFile(FPDF_FILEHANDLER* pFileHandler, void CPDFXFA_DocEnvironment::ToXFAContentFlags(CFX_WideString csSrcContent, FPDF_DWORD& flag) { - if (csSrcContent.Find(L" config ", 0) != -1) + if (csSrcContent.Find(L" config ", 0) != FX_STRNPOS) flag |= FXFA_CONFIG; - if (csSrcContent.Find(L" template ", 0) != -1) + if (csSrcContent.Find(L" template ", 0) != FX_STRNPOS) flag |= FXFA_TEMPLATE; - if (csSrcContent.Find(L" localeSet ", 0) != -1) + if (csSrcContent.Find(L" localeSet ", 0) != FX_STRNPOS) flag |= FXFA_LOCALESET; - if (csSrcContent.Find(L" datasets ", 0) != -1) + if (csSrcContent.Find(L" datasets ", 0) != FX_STRNPOS) flag |= FXFA_DATASETS; - if (csSrcContent.Find(L" xmpmeta ", 0) != -1) + if (csSrcContent.Find(L" xmpmeta ", 0) != FX_STRNPOS) flag |= FXFA_XMPMETA; - if (csSrcContent.Find(L" xfdf ", 0) != -1) + if (csSrcContent.Find(L" xfdf ", 0) != FX_STRNPOS) flag |= FXFA_XFDF; - if (csSrcContent.Find(L" form ", 0) != -1) + if (csSrcContent.Find(L" form ", 0) != FX_STRNPOS) flag |= FXFA_FORM; if (flag == 0) { flag = FXFA_CONFIG | FXFA_TEMPLATE | FXFA_LOCALESET | FXFA_DATASETS | @@ -840,11 +840,11 @@ bool CPDFXFA_DocEnvironment::MailToInfo(CFX_WideString& csURL, if (srcURL.Left(7).CompareNoCase(L"mailto:") != 0) return false; - int pos = srcURL.Find(L'?', 0); + FX_STRSIZE pos = srcURL.Find(L'?', 0); CFX_WideString tmp; - if (pos == -1) { + if (pos == FX_STRNPOS) { pos = srcURL.Find(L'@', 0); - if (pos == -1) + if (pos == FX_STRNPOS) return false; tmp = srcURL.Right(csURL.GetLength() - 7); @@ -863,7 +863,7 @@ bool CPDFXFA_DocEnvironment::MailToInfo(CFX_WideString& csURL, srcURL.TrimRight(); pos = srcURL.Find(L'&', 0); - tmp = (pos == -1) ? srcURL : srcURL.Left(pos); + tmp = (pos == FX_STRNPOS) ? srcURL : srcURL.Left(pos); tmp.TrimLeft(); tmp.TrimRight(); if (tmp.GetLength() >= 3 && tmp.Left(3).CompareNoCase(L"cc=") == 0) { |