Re-land else-after-returns

core/src/fpdfdoc/doc_basic.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"
 const int nMaxRecursion = 32;
 int CPDF_Dest::GetPageIndex(CPDF_Document* pDoc)
 {
@@ skipping 130 matching lines @@
 {
     if (nLevel > nMaxRecursion) {
         return NULL;
     }
     CPDF_Array* pNames = pNode->GetArray(FX_BSTRC("Names"));
     if (pNames) {
         int nCount = pNames->GetCount() / 2;
         if (nIndex >= nCurIndex + nCount) {
             nCurIndex += nCount;
             return NULL;
-        } else {
-            if (ppFind != NULL) {
-                *ppFind = pNames;
-            }
-            csName = pNames->GetString((nIndex - nCurIndex) * 2);
-            return pNames->GetElementValue((nIndex - nCurIndex) * 2 + 1);
         }
+        if (ppFind != NULL) {
+            *ppFind = pNames;
+        }
+        csName = pNames->GetString((nIndex - nCurIndex) * 2);
+        return pNames->GetElementValue((nIndex - nCurIndex) * 2 + 1);
     }
     CPDF_Array* pKids = pNode->GetArray(FX_BSTRC("Kids"));
     if (pKids == NULL) {
         return NULL;
     }
     for (FX_DWORD i = 0; i < pKids->GetCount(); i ++) {
         CPDF_Dictionary* pKid = pKids->GetDict(i);
         if (pKid == NULL) {
             continue;
         }
@@ skipping 395 matching lines @@
     if (nPage > 0 && nPage <= nPages) {
         return nPage;
     }
     return -1;
 }
 int32_t CPDF_PageLabel::GetPageByLabel(const CFX_WideStringC& wsLabel) const
 {
     CFX_ByteString bsLabel = PDF_EncodeText(wsLabel.GetPtr());
     return GetPageByLabel(bsLabel);
 }