Re-land else-after-returns

Revert "Revert "Fix else-after-returns throughout pdfium.""
This reverts commit 4eb4d7f6c707cc2c23c806aa540d055c8832b55d.

Fix one naming conflict.

TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/1243953004 .

1 files changed, 17 insertions, 19 deletions

diff --git a/fpdfsdk/src/fpdfppo.cpp b/fpdfsdk/src/fpdfppo.cpp
index 2e92d4a153..40d56b304d 100644
--- a/fpdfsdk/src/fpdfppo.cpp
+++ b/fpdfsdk/src/fpdfppo.cpp
@@ -185,9 +185,9 @@ 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();
@@ -200,19 +200,19 @@ CPDF_Object* CPDF_PageOrganizer::PageDictGetInheritableTag(
     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;
         }
     }
@@ -259,12 +259,10 @@ FX_BOOL CPDF_PageOrganizer::UpdateReference(CPDF_Object* 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;
         }
@@ -316,7 +314,8 @@ FX_DWORD CPDF_PageOrganizer::GetNewObjId(CPDF_Document* pDoc,
             if (!FXSYS_stricmp(strType, "Pages")) {
                 pDictClone->Release();
                 return 4;
-            } else if (!FXSYS_stricmp(strType, "Page")) {
+            }
+            if (!FXSYS_stricmp(strType, "Page")) {
                 pDictClone->Release();
                 return  0;
             }
@@ -373,10 +372,9 @@ FPDF_BOOL ParserPageRangeString(CFX_ByteString rangstring,
                     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;