Code change to avoid signed/unsigned mismatch warnings

core/fpdfdoc/doc_formfield.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 "core/fpdfapi/fpdf_parser/include/cfdf_document.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_number.h"
@@ skipping 440 matching lines @@
     sel_value =
         elementValue ? elementValue->GetUnicodeText() : CFX_WideString();
   }
   if (index < CountSelectedOptions()) {
     int iOptIndex = GetSelectedOptionIndex(index);
     CFX_WideString csOpt = GetOptionValue(iOptIndex);
     if (csOpt == sel_value) {
       return iOptIndex;
     }
   }
-  int nOpts = CountOptions();
-  for (int i = 0; i < nOpts; i++) {
-    if (sel_value == GetOptionValue(i)) {
+  for (int i = 0; i < CountOptions(); i++) {
+    if (sel_value == GetOptionValue(i))
       return i;
-    }
   }
   return -1;
 }
 FX_BOOL CPDF_FormField::ClearSelection(FX_BOOL bNotify) {
   if (bNotify && m_pForm->m_pFormNotify) {
     int iRet = 0;
     CFX_WideString csValue;
     int iIndex = GetSelectedIndex(0);
     if (iIndex >= 0) {
       csValue = GetOptionLabel(iIndex);
@@ skipping 17 matching lines @@
     if (GetType() == ComboBox) {
       m_pForm->m_pFormNotify->AfterValueChange(this);
     }
   }
   if (CPDF_InterForm::m_bUpdateAP) {
     UpdateAP(NULL);
   }
   m_pForm->m_bUpdated = TRUE;
   return TRUE;
 }
+
 FX_BOOL CPDF_FormField::IsItemSelected(int index) {
   ASSERT(GetType() == ComboBox || GetType() == ListBox);
   if (index < 0 || index >= CountOptions()) {
     return FALSE;
   }
   if (IsOptionSelected(index)) {
     return TRUE;
   }
   CFX_WideString opt_value = GetOptionValue(index);
   CPDF_Object* pValue = FPDF_GetFieldAttr(m_pDict, "V");
@@ skipping 24 matching lines @@
       break;
     }
   }
   for (uint32_t i = 0; i < pArray->GetCount(); i++)
     if (pArray->GetDirectObjectAt(i)->GetUnicodeText() == opt_value &&
         (int)i == iPos) {
       return TRUE;
     }
   return FALSE;
 }
+
 FX_BOOL CPDF_FormField::SetItemSelection(int index,
                                          FX_BOOL bSelected,
                                          FX_BOOL bNotify) {
   ASSERT(GetType() == ComboBox || GetType() == ListBox);
   if (index < 0 || index >= CountOptions()) {
     return FALSE;
   }
   CFX_WideString opt_value = GetOptionValue(index);
   if (bNotify && m_pForm->m_pFormNotify) {
     int iRet = 0;
@@ skipping 11 matching lines @@
     CPDF_Object* pValue = FPDF_GetFieldAttr(m_pDict, "V");
     if (pValue) {
       if (m_Type == ListBox) {
         SelectOption(index, FALSE);
         if (pValue->IsString()) {
           if (pValue->GetUnicodeText() == opt_value) {
             m_pDict->RemoveAt("V");
           }
         } else if (pValue->IsArray()) {
           CPDF_Array* pArray = new CPDF_Array;
-          int iCount = CountOptions();
-          for (int i = 0; i < iCount; i++) {
-            if (i != index) {
-              if (IsItemSelected(i)) {
-                opt_value = GetOptionValue(i);
-                pArray->AddString(PDF_EncodeText(opt_value));
-              }
+          for (int i = 0; i < CountOptions(); i++) {
+            if (i != index && IsItemSelected(i)) {
+              opt_value = GetOptionValue(i);
+              pArray->AddString(PDF_EncodeText(opt_value));
             }
           }
-          if (pArray->GetCount() < 1) {
+          if (pArray->GetCount() < 1)
             pArray->Release();
-          } else {
+          else
             m_pDict->SetAt("V", pArray);
-          }
         }
       } else if (m_Type == ComboBox) {
         m_pDict->RemoveAt("V");
         m_pDict->RemoveAt("I");
       }
     }
   } else {
     if (m_Type == ListBox) {
       SelectOption(index, TRUE);
       if (!(m_Flags & FORMLIST_MULTISELECT)) {
         m_pDict->SetAtString("V", PDF_EncodeText(opt_value));
       } else {
         CPDF_Array* pArray = new CPDF_Array;
-        int iCount = CountOptions();
-        for (int i = 0; i < iCount; i++) {
-          FX_BOOL bSelected;
-          if (i != index) {
-            bSelected = IsItemSelected(i);
-          } else {
-            bSelected = TRUE;
-          }
-          if (bSelected) {
+        for (int i = 0; i < CountOptions(); i++) {
+          if (i == index || IsItemSelected(i)) {
             opt_value = GetOptionValue(i);
             pArray->AddString(PDF_EncodeText(opt_value));
           }
         }
         m_pDict->SetAt("V", pArray);
       }
     } else if (m_Type == ComboBox) {
       m_pDict->SetAtString("V", PDF_EncodeText(opt_value));
       CPDF_Array* pI = new CPDF_Array;
       pI->AddInteger(index);
       m_pDict->SetAt("I", pI);
     }
   }
   if (bNotify && m_pForm->m_pFormNotify) {
     if (GetType() == ListBox) {
       m_pForm->m_pFormNotify->AfterSelectionChange(this);
     }
     if (GetType() == ComboBox) {
       m_pForm->m_pFormNotify->AfterValueChange(this);
     }
   }
   if (CPDF_InterForm::m_bUpdateAP) {
     UpdateAP(NULL);
   }
   m_pForm->m_bUpdated = TRUE;
   return TRUE;
 }
+
 FX_BOOL CPDF_FormField::IsItemDefaultSelected(int index) {
   ASSERT(GetType() == ComboBox || GetType() == ListBox);
-  if (index < 0 || index >= CountOptions()) {
+  if (index < 0 || index >= CountOptions())
     return FALSE;
-  }
   int iDVIndex = GetDefaultSelectedItem();
-  if (iDVIndex < 0) {
-    return FALSE;
-  }
-  return (iDVIndex == index);
+  return iDVIndex >= 0 && iDVIndex == index;
 }
+
 int CPDF_FormField::GetDefaultSelectedItem() {
   ASSERT(GetType() == ComboBox || GetType() == ListBox);
   CPDF_Object* pValue = FPDF_GetFieldAttr(m_pDict, "DV");
-  if (!pValue) {
+  if (!pValue)
     return -1;
-  }
   CFX_WideString csDV = pValue->GetUnicodeText();
-  if (csDV.IsEmpty()) {
+  if (csDV.IsEmpty())
     return -1;
-  }
-  int iCount = CountOptions();
-  for (int i = 0; i < iCount; i++) {
-    if (csDV == GetOptionValue(i)) {
+  for (int i = 0; i < CountOptions(); i++) {
+    if (csDV == GetOptionValue(i))
       return i;
-    }
   }
   return -1;
 }
+
 void CPDF_FormField::UpdateAP(CPDF_FormControl* pControl) {
-  if (m_Type == PushButton) {
+  if (m_Type == PushButton || m_Type == RadioButton || m_Type == CheckBox)
     return;
-  }
-  if (m_Type == RadioButton || m_Type == CheckBox) {
+  if (!m_pForm->m_bGenerateAP)
     return;
-  }
-  if (!m_pForm->m_bGenerateAP) {
-    return;
-  }
   for (int i = 0; i < CountControls(); i++) {
     CPDF_FormControl* pControl = GetControl(i);
     FPDF_GenerateAP(m_pForm->m_pDocument, pControl->m_pWidgetDict);
   }
 }
+
 int CPDF_FormField::CountOptions() {
   CPDF_Array* pArray = ToArray(FPDF_GetFieldAttr(m_pDict, "Opt"));
   return pArray ? pArray->GetCount() : 0;
 }
+
 CFX_WideString CPDF_FormField::GetOptionText(int index, int sub_index) {
   CPDF_Array* pArray = ToArray(FPDF_GetFieldAttr(m_pDict, "Opt"));
   if (!pArray)
     return CFX_WideString();
 
   CPDF_Object* pOption = pArray->GetDirectObjectAt(index);
   if (!pOption)
     return CFX_WideString();
   if (CPDF_Array* pOptionArray = pOption->AsArray())
     pOption = pOptionArray->GetDirectObjectAt(sub_index);
 
   CPDF_String* pString = ToString(pOption);
   return pString ? pString->GetUnicodeText() : CFX_WideString();
 }
 CFX_WideString CPDF_FormField::GetOptionLabel(int index) {
   return GetOptionText(index, 1);
 }
 CFX_WideString CPDF_FormField::GetOptionValue(int index) {
   return GetOptionText(index, 0);
 }
+
 int CPDF_FormField::FindOption(CFX_WideString csOptLabel) {
-  int iCount = CountOptions();
-  for (int i = 0; i < iCount; i++) {
-    CFX_WideString csValue = GetOptionValue(i);
-    if (csValue == csOptLabel) {
+  for (int i = 0; i < CountOptions(); i++) {
+    if (GetOptionValue(i) == csOptLabel)
       return i;
-    }
   }
   return -1;
 }
-int CPDF_FormField::FindOptionValue(const CFX_WideString& csOptValue,
-                                    int iStartIndex) {
-  if (iStartIndex < 0) {
-    iStartIndex = 0;
-  }
-  int iCount = CountOptions();
-  for (; iStartIndex < iCount; iStartIndex++) {
-    CFX_WideString csValue = GetOptionValue(iStartIndex);
-    if (csValue == csOptValue) {
-      return iStartIndex;
-    }
+
+int CPDF_FormField::FindOptionValue(const CFX_WideString& csOptValue) {
+  for (int i = 0; i < CountOptions(); i++) {
+    if (GetOptionValue(i) == csOptValue)
+      return i;
   }
   return -1;
 }
+
 #ifdef PDF_ENABLE_XFA
 int CPDF_FormField::InsertOption(CFX_WideString csOptLabel,
                                  int index,
                                  FX_BOOL bNotify) {
   if (csOptLabel.IsEmpty())
     return -1;
 
   if (bNotify && m_pForm->m_pFormNotify) {
     int iRet = 0;
     if (GetType() == ListBox)
@@ skipping 345 matching lines @@
     pFontDict = m_pForm->m_pFormDict->GetDictBy("DR")
                     ->GetDictBy("Font")
                     ->GetDictBy(font_name);
 
   if (!pFontDict) {
     return;
   }
   m_pFont = m_pForm->m_pDocument->LoadFont(pFontDict);
   m_FontSize = FX_atof(syntax.GetWord());
 }