summaryrefslogtreecommitdiff
path: root/core/fxcrt/widestring.cpp
diff options
context:
space:
mode:
authorRyan Harrison <rharrison@chromium.org>2017-09-27 11:07:51 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-09-27 16:18:11 +0000
commit8b1408e7053247def45659515cda19a64a7fccd5 (patch)
treef3dfb5ebd24fb4993c6b915917b97250b3739555 /core/fxcrt/widestring.cpp
parentbacf75eeeb5d89fe60b2c77584350ca1b1432bd5 (diff)
downloadpdfium-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 'core/fxcrt/widestring.cpp')
-rw-r--r--core/fxcrt/widestring.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/core/fxcrt/widestring.cpp b/core/fxcrt/widestring.cpp
index b9d6dc2080..adeb28cc16 100644
--- a/core/fxcrt/widestring.cpp
+++ b/core/fxcrt/widestring.cpp
@@ -135,7 +135,7 @@ pdfium::Optional<size_t> GuessSizeForVSWPrintf(const wchar_t* pFormat,
case 's': {
const wchar_t* pstrNextArg = va_arg(argList, const wchar_t*);
if (pstrNextArg) {
- nItemLen = FXSYS_wcslen(pstrNextArg);
+ nItemLen = wcslen(pstrNextArg);
if (nItemLen < 1) {
nItemLen = 1;
}
@@ -146,7 +146,7 @@ pdfium::Optional<size_t> GuessSizeForVSWPrintf(const wchar_t* pFormat,
case 'S': {
const char* pstrNextArg = va_arg(argList, const char*);
if (pstrNextArg) {
- nItemLen = FXSYS_strlen(pstrNextArg);
+ nItemLen = strlen(pstrNextArg);
if (nItemLen < 1) {
nItemLen = 1;
}
@@ -158,7 +158,7 @@ pdfium::Optional<size_t> GuessSizeForVSWPrintf(const wchar_t* pFormat,
case 'S' | FORCE_ANSI: {
const char* pstrNextArg = va_arg(argList, const char*);
if (pstrNextArg) {
- nItemLen = FXSYS_strlen(pstrNextArg);
+ nItemLen = strlen(pstrNextArg);
if (nItemLen < 1) {
nItemLen = 1;
}
@@ -170,7 +170,7 @@ pdfium::Optional<size_t> GuessSizeForVSWPrintf(const wchar_t* pFormat,
case 'S' | FORCE_UNICODE: {
const wchar_t* pstrNextArg = va_arg(argList, wchar_t*);
if (pstrNextArg) {
- nItemLen = FXSYS_wcslen(pstrNextArg);
+ nItemLen = wcslen(pstrNextArg);
if (nItemLen < 1) {
nItemLen = 1;
}
@@ -225,7 +225,7 @@ pdfium::Optional<size_t> GuessSizeForVSWPrintf(const wchar_t* pFormat,
f = va_arg(argList, double);
FXSYS_snprintf(pszTemp, sizeof(pszTemp), "%*.*f", nWidth,
nPrecision + 6, f);
- nItemLen = FXSYS_strlen(pszTemp);
+ nItemLen = strlen(pszTemp);
}
break;
case 'p':
@@ -304,7 +304,7 @@ WideString::WideString(wchar_t ch) {
}
WideString::WideString(const wchar_t* ptr)
- : WideString(ptr, ptr ? FXSYS_wcslen(ptr) : 0) {}
+ : WideString(ptr, ptr ? wcslen(ptr) : 0) {}
WideString::WideString(const WideStringView& stringSrc) {
if (!stringSrc.IsEmpty()) {
@@ -352,7 +352,7 @@ const WideString& WideString::operator=(const wchar_t* pStr) {
if (!pStr || !pStr[0])
clear();
else
- AssignCopy(pStr, FXSYS_wcslen(pStr));
+ AssignCopy(pStr, wcslen(pStr));
return *this;
}
@@ -375,7 +375,7 @@ const WideString& WideString::operator=(const WideString& stringSrc) {
const WideString& WideString::operator+=(const wchar_t* pStr) {
if (pStr)
- Concat(pStr, FXSYS_wcslen(pStr));
+ Concat(pStr, wcslen(pStr));
return *this;
}