Merge to XFA - else after returns.

core/src/fpdfdoc/doc_metadata.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 "../../include/fxcrt/fx_xml.h"
 typedef struct _PDFDOC_METADATA {
     CPDF_Document *m_pDoc;
@@ skipping 95 matching lines @@
             pElmnt = pElmnt->GetElement(NULL, FX_BSTRC("Alt"));
             if (!pElmnt) {
                 continue;
             }
             pElmnt = pElmnt->GetElement(NULL, FX_BSTRC("li"));
             if (!pElmnt) {
                 continue;
             }
             wsStr = pElmnt->GetContent(0);
             return wsStr.GetLength();
-        } else if (bsItem == FX_BSTRC("Author")) {
+        }
+        if (bsItem == FX_BSTRC("Author")) {
             CXML_Element *pElmnt = pTag->GetElement(NULL, bsTag);
             if (!pElmnt) {
                 continue;
             }
             pElmnt = pElmnt->GetElement(NULL, FX_BSTRC("Seq"));
             if (!pElmnt) {
                 continue;
             }
             pElmnt = pElmnt->GetElement(NULL, FX_BSTRC("li"));
             if (!pElmnt) {
                 continue;
             }
             wsStr = pElmnt->GetContent(0);
             return wsStr.GetLength();
-        } else {
-            CXML_Element *pElmnt = pTag->GetElement(NULL, bsTag);
-            if (!pElmnt) {
-                continue;
-            }
-            wsStr = pElmnt->GetContent(0);
-            return wsStr.GetLength();
         }
+        CXML_Element *pElmnt = pTag->GetElement(NULL, bsTag);
+        if (!pElmnt) {
+            continue;
+        }
+        wsStr = pElmnt->GetContent(0);
+        return wsStr.GetLength();
     }
     return -1;
 }
 CXML_Element* CPDF_Metadata::GetRoot() const
 {
     return ((PDFDOC_LPMETADATA)m_pData)->m_pXmlElmnt;
 }
 CXML_Element* CPDF_Metadata::GetRDF() const
 {
     return ((PDFDOC_LPMETADATA)m_pData)->m_pElmntRdf;
 }