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 <tsepez@chromium.org>
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Ryan Harrison <rharrison@chromium.org>

2 files changed, 10 insertions, 10 deletions

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);
diff --git a/core/fpdftext/cpdf_textpage.cpp b/core/fpdftext/cpdf_textpage.cpp
index 223b59f4e8..ffc3729af4 100644
--- a/core/fpdftext/cpdf_textpage.cpp
+++ b/core/fpdftext/cpdf_textpage.cpp
@@ -649,7 +649,7 @@ void CPDF_TextPage::AddCharInfoByLRDirection(wchar_t wChar,
     if (nCount >= 1) {
       pDst = FX_Alloc(wchar_t, nCount);
       Unicode_GetNormalization(wChar, pDst);
-      for (int nIndex = 0; nIndex < nCount; nIndex++) {
+      for (FX_STRSIZE nIndex = 0; nIndex < nCount; nIndex++) {
         PAGECHAR_INFO info2 = info;
         info2.m_Unicode = pDst[nIndex];
         info2.m_Flag = FPDFTEXT_CHAR_PIECE;
@@ -679,7 +679,7 @@ void CPDF_TextPage::AddCharInfoByRLDirection(wchar_t wChar,
   if (nCount >= 1) {
     pDst = FX_Alloc(wchar_t, nCount);
     Unicode_GetNormalization(wChar, pDst);
-    for (int nIndex = 0; nIndex < nCount; nIndex++) {
+    for (FX_STRSIZE nIndex = 0; nIndex < nCount; nIndex++) {
       PAGECHAR_INFO info2 = info;
       info2.m_Unicode = pDst[nIndex];
       info2.m_Flag = FPDFTEXT_CHAR_PIECE;
@@ -700,7 +700,7 @@ void CPDF_TextPage::CloseTempLine() {
 
   CFX_WideString str = m_TempTextBuf.MakeString();
   bool bPrevSpace = false;
-  for (int i = 0; i < str.GetLength(); i++) {
+  for (FX_STRSIZE i = 0; i < str.GetLength(); i++) {
     if (str[i] != ' ') {
       bPrevSpace = false;
       continue;
@@ -1222,7 +1222,7 @@ bool CPDF_TextPage::IsHyphen(wchar_t curChar) {
   FX_STRSIZE nCount = strCurText.GetLength();
   if (nCount < 1)
     return false;
-  int nIndex = nCount - 1;
+  FX_STRSIZE nIndex = nCount - 1;
   wchar_t wcTmp = strCurText[nIndex];
   while (wcTmp == 0x20 && nIndex > 0 && nIndex <= nCount - 1)
     wcTmp = strCurText[--nIndex];