Re-land else-after-returns

fpdfsdk/src/fpdfppo.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 "../../public/fpdf_ppo.h"
 #include "../../third_party/base/nonstd_unique_ptr.h"
 #include "../include/fsdk_define.h"
 
@@ skipping 167 matching lines @@
         ++curpage;
     }
 
     return TRUE;
 }
 
 CPDF_Object* CPDF_PageOrganizer::PageDictGetInheritableTag(
     CPDF_Dictionary* pDict,
     CFX_ByteString nSrctag)
 {
-    if (!pDict || !pDict->KeyExist("Type") || nSrctag.IsEmpty())
+    if (!pDict || nSrctag.IsEmpty())
         return nullptr;
-    if (!pDict->KeyExist("Parent"))
+    if (!pDict->KeyExist("Parent") || !pDict->KeyExist("Type"))
         return nullptr;
 
     CPDF_Object* pType = pDict->GetElement("Type")->GetDirect();
     if (!pType || pType->GetType() != PDFOBJ_NAME)
         return nullptr;
     if (pType->GetString().Compare("Page"))
         return nullptr;
 
     CPDF_Object* pParent = pDict->GetElement("Parent")->GetDirect();
     if (!pParent || pParent->GetType() != PDFOBJ_DICTIONARY)
         return nullptr;
 
-    CPDF_Dictionary* pp = (CPDF_Dictionary*)pParent;
-
     if (pDict->KeyExist((const char*)nSrctag))
         return pDict->GetElement((const char*)nSrctag);
 
+    CPDF_Dictionary* pp = (CPDF_Dictionary*)pParent;
     while (pp) {
         if (pp->KeyExist((const char*)nSrctag)) {
             return pp->GetElement((const char*)nSrctag);
-        } else if (pp->KeyExist("Parent")) {
-            pp = (CPDF_Dictionary*)pp->GetElement("Parent")->GetDirect();
-            if (pp->GetType() == PDFOBJ_NULL)
-                break;
-        } else {
+        }
+        if (!pp->KeyExist("Parent")) {
+            break;
+        }
+        pp = (CPDF_Dictionary*)pp->GetElement("Parent")->GetDirect();
+        if (pp->GetType() == PDFOBJ_NULL) {
             break;
         }
     }
 
     return nullptr;
 }
 
 FX_BOOL CPDF_PageOrganizer::UpdateReference(CPDF_Object* pObj,
                                             CPDF_Document* pDoc,
                                             ObjectNumberMap* pObjNumberMap)
@@ skipping 26 matching lines @@
                     return FALSE;
                 }
           }
           break;
         }
         case PDFOBJ_ARRAY: {
             CPDF_Array* pArray = (CPDF_Array*)pObj;
             FX_DWORD count = pArray->GetCount();
             for (FX_DWORD i = 0; i < count; ++i) {
                 CPDF_Object* pNextObj = pArray->GetElement(i);
-                if (pNextObj) {
-                    if (!UpdateReference(pNextObj, pDoc, pObjNumberMap))
-                        return FALSE;
-                } else {
+                if (!pNextObj)
                     return FALSE;
-                }
+                if (!UpdateReference(pNextObj, pDoc, pObjNumberMap))
+                    return FALSE;
             }
             break;
         }
         case PDFOBJ_STREAM: {
             CPDF_Stream* pStream = (CPDF_Stream*)pObj;
             CPDF_Dictionary* pDict = pStream->GetDict();
             if (pDict) {
                 if (!UpdateReference(pDict, pDoc, pObjNumberMap))
                     return FALSE;
             } else {
@@ skipping 31 matching lines @@
     if (!pClone)
         return 0;
 
     if (pClone->GetType() == PDFOBJ_DICTIONARY) {
         CPDF_Dictionary* pDictClone = (CPDF_Dictionary*)pClone;
         if (pDictClone->KeyExist("Type")) {
             CFX_ByteString strType = pDictClone->GetString("Type");
             if (!FXSYS_stricmp(strType, "Pages")) {
                 pDictClone->Release();
                 return 4;
-            } else if (!FXSYS_stricmp(strType, "Page")) {
+            }
+            if (!FXSYS_stricmp(strType, "Page")) {
                 pDictClone->Release();
                 return  0;
             }
         }
     }
     dwNewObjNum = pDoc->AddIndirectObject(pClone);
     (*pObjNumberMap)[dwObjnum] = dwNewObjNum;
 
     if (!UpdateReference(pClone, pDoc, pObjNumberMap)) {
         pClone->Release();
@@ skipping 36 matching lines @@
                 ++nMid;
                 int nEnd = cbMidRange.GetLength() - nMid;
                 if (nEnd == 0)
                     return FALSE;
 
                 int nEndPageNum = atol(cbMidRange.Mid(nMid, nEnd));
                 if (nStartPageNum < 0 ||
                     nStartPageNum >nEndPageNum ||
                     nEndPageNum > nCount) {
                     return FALSE;
-                } else {
-                    for (int i = nStartPageNum; i <= nEndPageNum; ++i) {
-                        pageArray->Add(i);
-                    }
+                }
+                for (int i = nStartPageNum; i <= nEndPageNum; ++i) {
+                    pageArray->Add(i);
                 }
             }
             nStringFrom = nStringTo + 1;
         }
     }
     return TRUE;
 }
 
 DLLEXPORT FPDF_BOOL STDCALL FPDF_ImportPages(FPDF_DOCUMENT dest_doc,
                                              FPDF_DOCUMENT src_doc,
@@ skipping 35 matching lines @@
     if (!pSrcDict)
         return FALSE;
 
     CPDF_Document* pDstDoc = (CPDF_Document*)dest_doc;
     CPDF_Dictionary* pDstDict = pDstDoc->GetRoot();
     if (!pDstDict)
         return FALSE;
     pDstDict->SetAt(FX_BSTRC("ViewerPreferences"), pSrcDict->Clone(TRUE));
     return TRUE;
 }