Merge to XFA - else after returns.

core/src/fpdfdoc/doc_form.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/fpdfdoc/fpdf_doc.h"
 #include "doc_utils.h"
 
 const int nMaxRecursion = 32;
@@ skipping 339 matching lines @@
     LOGFONTA    lf;
 } PDF_FONTDATA, FAR* LPDF_FONTDATA;
 static int CALLBACK EnumFontFamExProc(  ENUMLOGFONTEXA *lpelfe,
                                         NEWTEXTMETRICEX *lpntme,
                                         DWORD FontType,
                                         LPARAM lParam
                                      )
 {
     if (FontType != 0x004 || strchr(lpelfe->elfLogFont.lfFaceName, '@') != NULL) {
         return 1;
-    } else {
-        LPDF_FONTDATA pData = (LPDF_FONTDATA)lParam;
-        memcpy(&pData->lf, &lpelfe->elfLogFont, sizeof(LOGFONTA));
-        pData->bFind = TRUE;
-        return 0;
     }
+    LPDF_FONTDATA pData = (LPDF_FONTDATA)lParam;
+    memcpy(&pData->lf, &lpelfe->elfLogFont, sizeof(LOGFONTA));
+    pData->bFind = TRUE;
+    return 0;
 }
 static FX_BOOL RetrieveSpecificFont(LOGFONTA& lf)
 {
     PDF_FONTDATA fd;
     memset(&fd, 0, sizeof(PDF_FONTDATA));
     HDC hDC = ::GetDC(NULL);
     EnumFontFamiliesExA(hDC, &lf, (FONTENUMPROCA)EnumFontFamExProc, (LPARAM)&fd, 0);
     ::ReleaseDC(NULL, hDC);
     if (fd.bFind) {
         memcpy(&lf, &fd.lf, sizeof(LOGFONTA));
@@ skipping 317 matching lines @@
     if (pControl == NULL || csNewFieldName.IsEmpty()) {
         return FALSE;
     }
     CPDF_FormField* pField = ((CPDF_FormControl*)pControl)->GetField();
     return ValidateFieldName(csNewFieldName, pField->GetFieldType(), pField, pControl);
 }
 int CPDF_InterForm::CompareFieldName(const CFX_ByteString& name1, const CFX_ByteString& name2)
 {
     const FX_CHAR* ptr1 = name1;
     const FX_CHAR* ptr2 = name2;
-    if (name1.GetLength() != name2.GetLength()) {
-        int i = 0;
-        while (ptr1[i] == ptr2[i]) {
-            i ++;
-        }
-        if (i == name1.GetLength()) {
-            return 2;
-        }
-        if (i == name2.GetLength()) {
-            return 3;
-        }
-        return 0;
-    } else {
+    if (name1.GetLength() == name2.GetLength()) {
         return name1 == name2 ? 1 : 0;
     }
+    int i = 0;
+    while (ptr1[i] == ptr2[i]) {
+        i ++;
+    }
+    if (i == name1.GetLength()) {
+        return 2;
+    }
+    if (i == name2.GetLength()) {
+        return 3;
+    }
+    return 0;
 }
 int CPDF_InterForm::CompareFieldName(const CFX_WideString& name1, const CFX_WideString& name2)
 {
     const FX_WCHAR* ptr1 = name1.c_str();
     const FX_WCHAR* ptr2 = name2.c_str();
-    if (name1.GetLength() != name2.GetLength()) {
-        int i = 0;
-        while (ptr1[i] == ptr2[i]) {
-            i ++;
-        }
-        if (i == name1.GetLength()) {
-            return 2;
-        }
-        if (i == name2.GetLength()) {
-            return 3;
-        }
-        return 0;
-    } else {
+    if (name1.GetLength() == name2.GetLength()) {
         return name1 == name2 ? 1 : 0;
     }
+    int i = 0;
+    while (ptr1[i] == ptr2[i]) {
+        i ++;
+    }
+    if (i == name1.GetLength()) {
+        return 2;
+    }
+    if (i == name2.GetLength()) {
+        return 3;
+    }
+    return 0;
 }
 FX_DWORD CPDF_InterForm::CountFields(const CFX_WideString &csFieldName)
 {
     if (csFieldName.IsEmpty()) {
         return (FX_DWORD)m_pFieldTree->m_Root.CountFields();
     }
     CFieldTree::_Node *pNode = m_pFieldTree->FindNode(csFieldName);
     if (pNode == NULL) {
         return 0;
     }
@@ skipping 148 matching lines @@
     return NULL;
 }
 CPDF_FormControl* CPDF_InterForm::GetControlByDict(CPDF_Dictionary* pWidgetDict) const
 {
     CPDF_FormControl* pControl = NULL;
     m_ControlMap.Lookup(pWidgetDict, (void*&)pControl);
     return pControl;
 }
 FX_DWORD CPDF_InterForm::CountInternalFields(const CFX_WideString& csFieldName) const
 {
-    if (m_pFormDict == NULL) {
+    if (!m_pFormDict) {
         return 0;
     }
     CPDF_Array* pArray = m_pFormDict->GetArray("Fields");
-    if (pArray == NULL) {
+    if (!pArray) {
         return 0;
     }
     if (csFieldName.IsEmpty()) {
         return pArray->GetCount();
-    } else {
-        int iLength = csFieldName.GetLength();
-        int iPos = 0;
-        CPDF_Dictionary* pDict = NULL;
-        while (pArray != NULL) {
-            CFX_WideString csSub;
-            if (iPos < iLength && csFieldName[iPos] == L'.') {
-                iPos ++;
+    }
+    int iLength = csFieldName.GetLength();
+    int iPos = 0;
+    CPDF_Dictionary* pDict = NULL;
+    while (pArray != NULL) {
+        CFX_WideString csSub;
+        if (iPos < iLength && csFieldName[iPos] == L'.') {
+            iPos ++;
+        }
+        while (iPos < iLength && csFieldName[iPos] != L'.') {
+            csSub += csFieldName[iPos ++];
+        }
+        int iCount = pArray->GetCount();
+        FX_BOOL bFind = FALSE;
+        for (int i = 0; i < iCount; i ++) {
+            pDict = pArray->GetDict(i);
+            if (pDict == NULL) {
+                continue;
             }
-            while (iPos < iLength && csFieldName[iPos] != L'.') {
-                csSub += csFieldName[iPos ++];
-            }
-            int iCount = pArray->GetCount();
-            FX_BOOL bFind = FALSE;
-            for (int i = 0; i < iCount; i ++) {
-                pDict = pArray->GetDict(i);
-                if (pDict == NULL) {
-                    continue;
-                }
-                CFX_WideString csT = pDict->GetUnicodeText("T");
-                if (csT == csSub) {
-                    bFind = TRUE;
-                    break;
-                }
-            }
-            if (!bFind) {
-                return 0;
-            }
-            if (iPos >= iLength) {
+            CFX_WideString csT = pDict->GetUnicodeText("T");
+            if (csT == csSub) {
+                bFind = TRUE;
                 break;
             }
-            pArray = pDict->GetArray("Kids");
         }
-        if (pDict == NULL) {
+        if (!bFind) {
             return 0;
-        } else {
-            pArray = pDict->GetArray("Kids");
-            if (pArray == NULL) {
-                return 1;
-            } else {
-                return pArray->GetCount();
-            }
         }
+        if (iPos >= iLength) {
+            break;
+        }
+        pArray = pDict->GetArray("Kids");
     }
+    if (!pDict) {
+        return 0;
+    }
+    pArray = pDict->GetArray("Kids");
+    return pArray ? pArray->GetCount() : 1;
 }
+
 CPDF_Dictionary* CPDF_InterForm::GetInternalField(FX_DWORD index, const CFX_WideString& csFieldName) const
 {
-    if (m_pFormDict == NULL) {
-        return NULL;
+    if (!m_pFormDict) {
+        return nullptr;
     }
     CPDF_Array* pArray = m_pFormDict->GetArray("Fields");
-    if (pArray == NULL) {
-        return 0;
+    if (!pArray) {
+        return nullptr;
     }
     if (csFieldName.IsEmpty()) {
         return pArray->GetDict(index);
-    } else {
-        int iLength = csFieldName.GetLength();
-        int iPos = 0;
-        CPDF_Dictionary* pDict = NULL;
-        while (pArray != NULL) {
-            CFX_WideString csSub;
-            if (iPos < iLength && csFieldName[iPos] == L'.') {
-                iPos ++;
+    }
+    int iLength = csFieldName.GetLength();
+    int iPos = 0;
+    CPDF_Dictionary* pDict = NULL;
+    while (pArray != NULL) {
+        CFX_WideString csSub;
+        if (iPos < iLength && csFieldName[iPos] == L'.') {
+            iPos ++;
+        }
+        while (iPos < iLength && csFieldName[iPos] != L'.') {
+            csSub += csFieldName[iPos ++];
+        }
+        int iCount = pArray->GetCount();
+        FX_BOOL bFind = FALSE;
+        for (int i = 0; i < iCount; i ++) {
+            pDict = pArray->GetDict(i);
+            if (pDict == NULL) {
+                continue;
             }
-            while (iPos < iLength && csFieldName[iPos] != L'.') {
-                csSub += csFieldName[iPos ++];
-            }
-            int iCount = pArray->GetCount();
-            FX_BOOL bFind = FALSE;
-            for (int i = 0; i < iCount; i ++) {
-                pDict = pArray->GetDict(i);
-                if (pDict == NULL) {
-                    continue;
-                }
-                CFX_WideString csT = pDict->GetUnicodeText("T");
-                if (csT == csSub) {
-                    bFind = TRUE;
-                    break;
-                }
-            }
-            if (!bFind) {
-                return NULL;
-            }
-            if (iPos >= iLength) {
+            CFX_WideString csT = pDict->GetUnicodeText("T");
+            if (csT == csSub) {
+                bFind = TRUE;
                 break;
             }
-            pArray = pDict->GetArray("Kids");
         }
-        if (pDict == NULL) {
+        if (!bFind) {
             return NULL;
-        } else {
-            pArray = pDict->GetArray("Kids");
-            if (pArray == NULL) {
-                return pDict;
-            } else {
-                return pArray->GetDict(index);
-            }
         }
+        if (iPos >= iLength) {
+            break;
+        }
+        pArray = pDict->GetArray("Kids");
     }
+    if (!pDict) {
+        return nullptr;
+    }
+    pArray = pDict->GetArray("Kids");
+    return pArray ? pArray->GetDict(index) : pDict;
 }
 FX_BOOL CPDF_InterForm::NeedConstructAP()
 {
     if (m_pFormDict == NULL) {
         return FALSE;
     }
     return m_pFormDict->GetBoolean("NeedAppearances");
 }
 void CPDF_InterForm::NeedConstructAP(FX_BOOL bNeedAP)
 {
@@ skipping 613 matching lines @@
                 continue;
             }
             CPDF_FormControl* pControl = NULL;
             if (m_ControlMap.Lookup(pAnnotDict, (void*&)pControl)) {
                 return iNewPage;
             }
         }
     } while (TRUE);
     return -1;
 }