diff options
| author | Ryan Harrison <rharrison@chromium.org> | 2017-09-27 11:07:51 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-27 16:18:11 +0000 |
| commit | 8b1408e7053247def45659515cda19a64a7fccd5 (patch) | |
| tree | f3dfb5ebd24fb4993c6b915917b97250b3739555 /fpdfsdk | |
| parent | bacf75eeeb5d89fe60b2c77584350ca1b1432bd5 (diff) | |
| download | pdfium-8b1408e7053247def45659515cda19a64a7fccd5.tar.xz | |
Remove FXSYS_strlen and FXSYS_wcslenchromium/3226
With the conversion of internal string sizes to size_t, these wrappers
are no longer needed. Replacing them with strlen and wcslen
respectively.
BUG=pdfium:828
Change-Id: Ia087ca2ddaf688a57ec9bd9ddfb8533cbe41510d
Reviewed-on: https://pdfium-review.googlesource.com/14890
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fpdfsdk')
| -rw-r--r-- | fpdfsdk/fpdfview.cpp | 2 | ||||
| -rw-r--r-- | fpdfsdk/javascript/Field.cpp | 3 | ||||
| -rw-r--r-- | fpdfsdk/javascript/util.cpp | 5 |
3 files changed, 4 insertions, 6 deletions
diff --git a/fpdfsdk/fpdfview.cpp b/fpdfsdk/fpdfview.cpp index bbd60bdd59..40851176e2 100644 --- a/fpdfsdk/fpdfview.cpp +++ b/fpdfsdk/fpdfview.cpp @@ -1398,7 +1398,7 @@ FPDF_EXPORT FPDF_RESULT FPDF_CALLCONV FPDF_BStr_Set(FPDF_BSTR* str, if (!bstr || !length) return -1; if (length == -1) - length = FXSYS_strlen(bstr); + length = strlen(bstr); if (length == 0) { if (str->str) { diff --git a/fpdfsdk/javascript/Field.cpp b/fpdfsdk/javascript/Field.cpp index fa5d478555..a89df16158 100644 --- a/fpdfsdk/javascript/Field.cpp +++ b/fpdfsdk/javascript/Field.cpp @@ -2610,8 +2610,7 @@ bool Field::value(CJS_Runtime* pRuntime, iIndex = pFormField->GetSelectedIndex(i); ElementValue = CJS_Value(pRuntime, pFormField->GetOptionValue(iIndex).c_str()); - if (FXSYS_wcslen(ElementValue.ToCFXWideString(pRuntime).c_str()) == - 0) { + if (wcslen(ElementValue.ToCFXWideString(pRuntime).c_str()) == 0) { ElementValue = CJS_Value(pRuntime, pFormField->GetOptionLabel(iIndex).c_str()); } diff --git a/fpdfsdk/javascript/util.cpp b/fpdfsdk/javascript/util.cpp index c4b15685dd..b82020d874 100644 --- a/fpdfsdk/javascript/util.cpp +++ b/fpdfsdk/javascript/util.cpp @@ -206,7 +206,7 @@ bool util::printd(CJS_Runtime* pRuntime, int iEnd; while ((iEnd = cFormat.find(TbConvertTable[i].lpszJSMark, iStart)) != -1) { - cFormat.replace(iEnd, FXSYS_wcslen(TbConvertTable[i].lpszJSMark), + cFormat.replace(iEnd, wcslen(TbConvertTable[i].lpszJSMark), TbConvertTable[i].lpszCppMark); iStart = iEnd; } @@ -243,8 +243,7 @@ bool util::printd(CJS_Runtime* pRuntime, continue; } } - cFormat.replace(iEnd, FXSYS_wcslen(cTableAd[i].lpszJSMark), - sValue.c_str()); + cFormat.replace(iEnd, wcslen(cTableAd[i].lpszJSMark), sValue.c_str()); iStart = iEnd; } } |