From aa3a9cd82df9dff1ef136797259e606a39c18b75 Mon Sep 17 00:00:00 2001 From: Ryan Harrison Date: Tue, 29 Aug 2017 16:39:44 -0400 Subject: Convert int* references to FX_STRSIZE Through out the code base there are numerous places where variables are declared using a signed integer type when interacting with the string classes, since they assume that FX_STRSIZE is 'int'. As part of changing the underling type of FX_STRSIZE to be unsigned, these locations are being changed to use FX_STRSIZE. This is necessary as part of converting the type, but has been broken off into a separate CL, since it should be low risk. Some related cleanups that are low risk are included as part of this CL. BUG=pdfium:828 Change-Id: Ifaae54ad195ccde0fe8672f71271d29a6ebd65fd Reviewed-on: https://pdfium-review.googlesource.com/12210 Reviewed-by: Tom Sepez Reviewed-by: Henrique Nakashima Reviewed-by: dsinclair Commit-Queue: Ryan Harrison --- core/fpdftext/cpdf_linkextract.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'core/fpdftext/cpdf_linkextract.cpp') diff --git a/core/fpdftext/cpdf_linkextract.cpp b/core/fpdftext/cpdf_linkextract.cpp index cfa9dbba7f..880a4ceb92 100644 --- a/core/fpdftext/cpdf_linkextract.cpp +++ b/core/fpdftext/cpdf_linkextract.cpp @@ -244,8 +244,8 @@ bool CPDF_LinkExtract::CheckMailLink(CFX_WideString* str) { return false; // Check the local part. - int pPos = aPos.value(); // Used to track the position of '@' or '.'. - for (int i = aPos.value() - 1; i >= 0; i--) { + FX_STRSIZE pPos = aPos.value(); // Used to track the position of '@' or '.'. + for (FX_STRSIZE i = aPos.value() - 1; i >= 0; i--) { wchar_t ch = (*str)[i]; if (ch == L'_' || ch == L'-' || FXSYS_iswalnum(ch)) continue; @@ -257,7 +257,7 @@ bool CPDF_LinkExtract::CheckMailLink(CFX_WideString* str) { } // End extracting for other invalid chars, '.' at the beginning, or // consecutive '.'. - int removed_len = i == pPos - 1 ? i + 2 : i + 1; + FX_STRSIZE removed_len = i == pPos - 1 ? i + 2 : i + 1; *str = str->Right(str->GetLength() - removed_len); break; } @@ -279,16 +279,16 @@ bool CPDF_LinkExtract::CheckMailLink(CFX_WideString* str) { return false; // Validate all other chars in domain name. - int nLen = str->GetLength(); + FX_STRSIZE nLen = str->GetLength(); pPos = 0; // Used to track the position of '.'. - for (int i = aPos.value() + 1; i < nLen; i++) { + for (FX_STRSIZE i = aPos.value() + 1; i < nLen; i++) { wchar_t wch = (*str)[i]; if (wch == L'-' || FXSYS_iswalnum(wch)) continue; if (wch != L'.' || i == pPos + 1) { // Domain name should end before invalid char. - int host_end = i == pPos + 1 ? i - 2 : i - 1; + FX_STRSIZE host_end = i == pPos + 1 ? i - 2 : i - 1; if (pPos > 0 && host_end - aPos.value() >= 3) { // Trim the ending invalid chars if there is at least one '.' and name. *str = str->Left(host_end + 1); -- cgit v1.2.3