Fix some sign comparison warnings.

fpdfsdk/src/javascript/util.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../include/javascript/JavaScript.h"
 #include "../../include/javascript/IJavaScript.h"
 #include "../../include/javascript/JS_Define.h"
 #include "../../include/javascript/JS_Object.h"
@@ skipping 235 matching lines @@
 
     bool bXFAPicture = false;
     if (iSize > 2) {
       bXFAPicture = params[2].ToBool();
     }
 
     if (bXFAPicture) {
       return FALSE;  // currently, it doesn't support XFAPicture.
     }
 
-    int iIndex;
-    for (iIndex = 0; iIndex < sizeof(fcTable) / sizeof(stru_TbConvert);
-         iIndex++) {
+    for (size_t i = 0; i < sizeof(fcTable) / sizeof(stru_TbConvert); ++i) {
       int iStart = 0;
       int iEnd;
-      while ((iEnd = cFormat.find(fcTable[iIndex].lpszJSMark, iStart)) != -1) {
-        cFormat.replace(iEnd, FXSYS_wcslen(fcTable[iIndex].lpszJSMark),
-                        fcTable[iIndex].lpszCppMark);
+      while ((iEnd = cFormat.find(fcTable[i].lpszJSMark, iStart)) != -1) {
+        cFormat.replace(iEnd, FXSYS_wcslen(fcTable[i].lpszJSMark),
+                        fcTable[i].lpszCppMark);
         iStart = iEnd;
       }
     }
 
     int iYear, iMonth, iDay, iHour, iMin, iSec;
     iYear = jsDate.GetYear();
     iMonth = jsDate.GetMonth();
     iDay = jsDate.GetDay();
     iHour = jsDate.GetHours();
     iMin = jsDate.GetMinutes();
@@ skipping 11 matching lines @@
       const FX_WCHAR* lpszJSMark;
       int iValue;
     };
 
     stru_TbConvertAd cTableAd[] = {
         {L"m", iMonth + 1}, {L"d", iDay},
         {L"H", iHour},      {L"h", iHour > 12 ? iHour - 12 : iHour},
         {L"M", iMin},       {L"s", iSec},
     };
 
-    for (iIndex = 0; iIndex < sizeof(cTableAd) / sizeof(stru_TbConvertAd);
-         iIndex++) {
+    for (size_t i = 0; i < sizeof(cTableAd) / sizeof(stru_TbConvertAd); ++i) {
       wchar_t tszValue[10];
       CFX_WideString sValue;
-      sValue.Format(L"%d", cTableAd[iIndex].iValue);
+      sValue.Format(L"%d", cTableAd[i].iValue);
       memcpy(tszValue, (wchar_t*)sValue.GetBuffer(sValue.GetLength() + 1),
              (sValue.GetLength() + 1) * sizeof(wchar_t));
 
       int iStart = 0;
       int iEnd;
-      while ((iEnd = cFormat.find(cTableAd[iIndex].lpszJSMark, iStart)) != -1) {
+      while ((iEnd = cFormat.find(cTableAd[i].lpszJSMark, iStart)) != -1) {
         if (iEnd > 0) {
           if (cFormat[iEnd - 1] == L'%') {
             iStart = iEnd + 1;
             continue;
           }
         }
-        cFormat.replace(iEnd, FXSYS_wcslen(cTableAd[iIndex].lpszJSMark),
-                        tszValue);
+        cFormat.replace(iEnd, FXSYS_wcslen(cTableAd[i].lpszJSMark), tszValue);
         iStart = iEnd;
       }
     }
 
     CFX_WideString strFormat;
     wchar_t buf[64] = {};
     strFormat = wcsftime(buf, 64, cFormat.c_str(), &time);
     cFormat = buf;
     vRet = cFormat.c_str();
     return TRUE;
   }
   return FALSE;
 }
 
 void util::printd(const std::wstring& cFormat2,
                   CJS_Date jsDate,
                   bool bXFAPicture,
                   std::wstring& cPurpose) {
   std::wstring cFormat = cFormat2;
 
   if (bXFAPicture) {
     return;  // currently, it doesn't support XFAPicture.
   }
 
-  int iIndex;
-  for (iIndex = 0; iIndex < sizeof(fcTable) / sizeof(stru_TbConvert);
-       iIndex++) {
+  for (size_t i = 0; i < sizeof(fcTable) / sizeof(stru_TbConvert); ++i) {
     int iStart = 0;
     int iEnd;
-    while ((iEnd = cFormat.find(fcTable[iIndex].lpszJSMark, iStart)) != -1) {
-      cFormat.replace(iEnd, FXSYS_wcslen(fcTable[iIndex].lpszJSMark),
-                      fcTable[iIndex].lpszCppMark);
+    while ((iEnd = cFormat.find(fcTable[i].lpszJSMark, iStart)) != -1) {
+      cFormat.replace(iEnd, FXSYS_wcslen(fcTable[i].lpszJSMark),
+                      fcTable[i].lpszCppMark);
       iStart = iEnd;
     }
   }
 
   int iYear, iMonth, iDay, iHour, iMin, iSec;
   iYear = jsDate.GetYear();
   iMonth = jsDate.GetMonth();
   iDay = jsDate.GetDay();
   iHour = jsDate.GetHours();
   iMin = jsDate.GetMinutes();
@@ skipping 14 matching lines @@
     int iValue;
   };
 
   stru_TbConvertAd cTableAd[] = {
       {L"m", iMonth + 1}, {L"d", iDay},
       {L"H", iHour},      {L"h", iHour > 12 ? iHour - 12 : iHour},
       {L"M", iMin},       {L"s", iSec},
   };
 
   // cFormat = strFormat.GetBuffer(strFormat.GetLength()+1);
-  for (iIndex = 0; iIndex < sizeof(cTableAd) / sizeof(stru_TbConvertAd);
-       iIndex++) {
+  for (size_t i = 0; i < sizeof(cTableAd) / sizeof(stru_TbConvertAd); ++i) {
     wchar_t tszValue[10];
-    //_itot(cTableAd[iIndex].iValue,tszValue,10);
     CFX_WideString sValue;
-    sValue.Format(L"%d", cTableAd[iIndex].iValue);
+    sValue.Format(L"%d", cTableAd[i].iValue);
     memcpy(tszValue, (wchar_t*)sValue.GetBuffer(sValue.GetLength() + 1),
            sValue.GetLength() * sizeof(wchar_t));
 
-    // strFormat.Replace(cTableAd[iIndex].lpszJSMark,"%d");
-    // strFormat.Format(strFormat,cTableAd[iIndex].iValue);
     int iStart = 0;
     int iEnd;
-    while ((iEnd = cFormat.find(cTableAd[iIndex].lpszJSMark, iStart)) != -1) {
+    while ((iEnd = cFormat.find(cTableAd[i].lpszJSMark, iStart)) != -1) {
       if (iEnd > 0) {
         if (cFormat[iEnd - 1] == L'%') {
           iStart = iEnd + 1;
           continue;
         }
       }
-      cFormat.replace(iEnd, FXSYS_wcslen(cTableAd[iIndex].lpszJSMark),
-                      tszValue);
+      cFormat.replace(iEnd, FXSYS_wcslen(cTableAd[i].lpszJSMark), tszValue);
       iStart = iEnd;
     }
   }
 
   CFX_WideString strFormat;
   wchar_t buf[64] = {};
   strFormat = wcsftime(buf, 64, cFormat.c_str(), &time);
   cFormat = buf;
   cPurpose = cFormat;
 }
@@ skipping 22 matching lines @@
   if (!cPurpose.empty())
     // cPurpose.clear();
     cPurpose.erase();
   int itSource = 0;
   int iSize = cSource.size();
   for (int iIndex = 0; iIndex < (int)cFormat.size() && itSource < iSize;
        iIndex++) {
     char letter = cFormat[iIndex];
     switch (letter) {
       case '?':
-        // cPurpose.push_back(cSource[itSource]);
         cPurpose += cSource[itSource];
         itSource++;
         break;
       case 'X': {
         while (itSource < iSize) {
           if ((cSource[itSource] >= '0' && cSource[itSource] <= '9') ||
               (cSource[itSource] >= 'a' && cSource[itSource] <= 'z') ||
               (cSource[itSource] >= 'A' && cSource[itSource] <= 'Z')) {
-            // cPurpose.push_back(cSource[itSource]);
             cPurpose += cSource[itSource];
             itSource++;
             break;
           }
           itSource++;
         }
         break;
       } break;
       case 'A': {
         while (itSource < iSize) {
           if ((cSource[itSource] >= 'a' && cSource[itSource] <= 'z') ||
               (cSource[itSource] >= 'A' && cSource[itSource] <= 'Z')) {
-            // cPurpose.push_back(cSource[itSource]);
             cPurpose += cSource[itSource];
             itSource++;
             break;
           }
           itSource++;
         }
         break;
       } break;
       case '9': {
         while (itSource < iSize) {
           if (cSource[itSource] >= '0' && cSource[itSource] <= '9') {
-            // cPurpose.push_back(cSource[itSource]);
             cPurpose += cSource[itSource];
             itSource++;
             break;
           }
           itSource++;
         }
         break;
       }
       case '*': {
         cPurpose.append(cSource, itSource, iSize - itSource);
@@ skipping 12 matching lines @@
       case '<': {
         for (std::string::iterator it = cSource.begin(); it != cSource.end();
              it++) {
           *it = tolower(*it);
         }
         break;
       }
       case '=':
         break;
       default:
-        // cPurpose.push_back(letter);
         cPurpose += letter;
         break;
     }
   }
 }
 
 FX_BOOL util::scand(IFXJS_Context* cc,
                     const CJS_Parameters& params,
                     CJS_Value& vRet,
                     CFX_WideString& sError) {
@@ skipping 51 matching lines @@
   int iSize = params.size();
   if (iSize == 0)
     return FALSE;
   int nByte = params[0].ToInt();
   unsigned char cByte = (unsigned char)nByte;
   CFX_WideString csValue;
   csValue.Format(L"%c", cByte);
   vRet = csValue.c_str();
   return TRUE;
 }