Re-land else-after-returns

core/src/fpdfdoc/doc_action.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"
 CPDF_Dest CPDF_Action::GetDest(CPDF_Document* pDoc) const
 {
     if (!m_pDict) {
@@ skipping 94 matching lines @@
         pFields = pDict->GetElementValue("T");
     } else {
         pFields = pDict->GetArray("Fields");
     }
     if (pFields == NULL) {
         return 0;
     }
     int iType = pFields->GetType();
     if (iType == PDFOBJ_DICTIONARY) {
         return 1;
-    } else if (iType == PDFOBJ_STRING) {
+    }
+    if (iType == PDFOBJ_STRING) {
         return 1;
-    } else if (iType == PDFOBJ_ARRAY) {
+    }
+    if (iType == PDFOBJ_ARRAY) {
         return ((CPDF_Array*)pFields)->GetCount();
     }
     return 0;
 }
 void CPDF_ActionFields::GetAllFields(CFX_PtrArray& fieldObjects) const
 {
     fieldObjects.RemoveAll();
     if (m_pAction == NULL) {
         return;
     }
@@ skipping 72 matching lines @@
         return csJS;
     }
     CPDF_Object* pJS = m_pDict->GetElementValue("JS");
     if (pJS != NULL) {
         return pJS->GetUnicodeText();
     }
     return csJS;
 }
 CPDF_Dictionary* CPDF_Action::GetAnnot() const
 {
-    if (m_pDict == NULL) {
-        return NULL;
+    if (!m_pDict) {
+        return nullptr;
     }
     CFX_ByteString csType = m_pDict->GetString("S");
     if (csType == FX_BSTRC("Rendition")) {
         return m_pDict->GetDict("AN");
-    } else if (csType == FX_BSTRC("Movie")) {
+    }
+    if (csType == FX_BSTRC("Movie")) {
         return m_pDict->GetDict("Annotation");
     }
-    return NULL;
+    return nullptr;
 }
 int32_t CPDF_Action::GetOperationType() const
 {
     if (m_pDict == NULL) {
         return 0;
     }
     CFX_ByteString csType = m_pDict->GetString("S");
     if (csType == FX_BSTRC("Rendition")) {
         return m_pDict->GetInteger("OP");
-    } else if (csType == FX_BSTRC("Movie")) {
+    }
+    if (csType == FX_BSTRC("Movie")) {
         CFX_ByteString csOP = m_pDict->GetString("Operation");
         if (csOP == FX_BSTRC("Play")) {
             return 0;
-        } else if (csOP == FX_BSTRC("Stop")) {
+        }
+        if (csOP == FX_BSTRC("Stop")) {
             return 1;
-        } else if (csOP == FX_BSTRC("Pause")) {
+        }
+        if (csOP == FX_BSTRC("Pause")) {
             return 2;
-        } else if (csOP == FX_BSTRC("Resume")) {
+        }
+        if (csOP == FX_BSTRC("Resume")) {
             return 3;
         }
     }
     return 0;
 }
 FX_DWORD CPDF_Action::GetSubActionsCount() const
 {
     if (m_pDict == NULL || !m_pDict->KeyExist("Next")) {
         return 0;
     }
@@ skipping 108 matching lines @@
         return CPDF_Action();
     }
     return CPDF_Action(pAction->GetDict());
 }
 int CPDF_DocJSActions::FindJSAction(const CFX_ByteString& csName) const
 {
     ASSERT(m_pDocument != NULL);
     CPDF_NameTree name_tree(m_pDocument, FX_BSTRC("JavaScript"));
     return name_tree.GetIndex(csName);
 }