From 8b1408e7053247def45659515cda19a64a7fccd5 Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Wed, 27 Sep 2017 11:07:51 -0400 Subject: Remove FXSYS_strlen and FXSYS_wcslen 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 Reviewed-by: dsinclair --- core/fxge/android/cfpf_skiafontdescriptor.cpp | 2 +- core/fxge/android/cfpf_skiafontmgr.cpp | 2 +- core/fxge/android/cfpf_skiapathfont.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'core/fxge') diff --git a/core/fxge/android/cfpf_skiafontdescriptor.cpp b/core/fxge/android/cfpf_skiafontdescriptor.cpp index 0c5210795c..8dd4481a7d 100644 --- a/core/fxge/android/cfpf_skiafontdescriptor.cpp +++ b/core/fxge/android/cfpf_skiafontdescriptor.cpp @@ -25,7 +25,7 @@ int32_t CFPF_SkiaFontDescriptor::GetType() const { void CFPF_SkiaFontDescriptor::SetFamily(const char* pFamily) { FX_Free(m_pFamily); - int32_t iSize = FXSYS_strlen(pFamily); + int32_t iSize = strlen(pFamily); m_pFamily = FX_Alloc(char, iSize + 1); memcpy(m_pFamily, pFamily, iSize * sizeof(char)); m_pFamily[iSize] = 0; diff --git a/core/fxge/android/cfpf_skiafontmgr.cpp b/core/fxge/android/cfpf_skiafontmgr.cpp index af1d58f696..214e718e0b 100644 --- a/core/fxge/android/cfpf_skiafontmgr.cpp +++ b/core/fxge/android/cfpf_skiafontmgr.cpp @@ -93,7 +93,7 @@ uint32_t FPF_GetHashCode_StringA(const char* pStr, int32_t iLength) { if (!pStr) return 0; if (iLength < 0) - iLength = FXSYS_strlen(pStr); + iLength = strlen(pStr); const char* pStrEnd = pStr + iLength; uint32_t uHashCode = 0; while (pStr < pStrEnd) diff --git a/core/fxge/android/cfpf_skiapathfont.cpp b/core/fxge/android/cfpf_skiapathfont.cpp index 44e19bc8e5..27f4fde988 100644 --- a/core/fxge/android/cfpf_skiapathfont.cpp +++ b/core/fxge/android/cfpf_skiapathfont.cpp @@ -20,7 +20,7 @@ int32_t CFPF_SkiaPathFont::GetType() const { void CFPF_SkiaPathFont::SetPath(const char* pPath) { FX_Free(m_pPath); - int32_t iSize = FXSYS_strlen(pPath); + int32_t iSize = strlen(pPath); m_pPath = FX_Alloc(char, iSize + 1); memcpy(m_pPath, pPath, iSize * sizeof(char)); m_pPath[iSize] = 0; -- cgit v1.2.3