Fix else-after-returns throughout pdfium.

fpdfsdk/src/fxedit/fxet_edit.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/fxedit/fxet_stub.h"
 #include "../../include/fxedit/fxet_edit.h"
 
 #define FX_EDIT_UNDO_MAXITEM                            10000
 
 /* ---------------------------- CFX_Edit_Iterator ---------------------------- */
 
 CFX_Edit_Iterator::CFX_Edit_Iterator(CFX_Edit * pEdit,IPDF_VariableText_Iterator * pVTIterator) :
         m_pEdit(pEdit),
         m_pVTIterator(pVTIterator)
 {
 }
 
 CFX_Edit_Iterator::~CFX_Edit_Iterator()
 {
 }
 
 FX_BOOL CFX_Edit_Iterator::NextWord()
 {
-        ASSERT(m_pVTIterator != NULL);
-
         return m_pVTIterator->NextWord();
 }
 
 FX_BOOL CFX_Edit_Iterator::NextLine()
 {
-        ASSERT(m_pVTIterator != NULL);
-
         return m_pVTIterator->NextLine();
 }
 
 FX_BOOL CFX_Edit_Iterator::NextSection()
 {
-        ASSERT(m_pVTIterator != NULL);
-
         return m_pVTIterator->NextSection();
 }
 
 FX_BOOL CFX_Edit_Iterator::PrevWord()
 {
-        ASSERT(m_pVTIterator != NULL);
-
         return m_pVTIterator->PrevWord();
 }
 
 FX_BOOL CFX_Edit_Iterator::PrevLine()
 {
-        ASSERT(m_pVTIterator != NULL);
-
         return m_pVTIterator->PrevLine();
 }
 
 FX_BOOL CFX_Edit_Iterator::PrevSection()
 {
-        ASSERT(m_pVTIterator != NULL);
-
         return m_pVTIterator->PrevSection();
 }
 
 FX_BOOL CFX_Edit_Iterator::GetWord(CPVT_Word & word) const
 {
-        ASSERT(m_pEdit != NULL);
-        ASSERT(m_pVTIterator != NULL);
+        ASSERT(m_pEdit);
 
         if (m_pVTIterator->GetWord(word))
         {
                 word.ptWord = m_pEdit->VTToEdit(word.ptWord);
                 return TRUE;
         }
-
         return FALSE;
 }
 
 FX_BOOL CFX_Edit_Iterator::GetLine(CPVT_Line & line) const
 {
-        ASSERT(m_pEdit != NULL);
-        ASSERT(m_pVTIterator != NULL);
+        ASSERT(m_pEdit);
 
         if (m_pVTIterator->GetLine(line))
         {
                 line.ptLine = m_pEdit->VTToEdit(line.ptLine);
                 return TRUE;
         }
-
         return FALSE;
 }
 
 FX_BOOL CFX_Edit_Iterator::GetSection(CPVT_Section & section) const
 {
-        ASSERT(m_pEdit != NULL);
-        ASSERT(m_pVTIterator != NULL);
+        ASSERT(m_pEdit);
 
         if (m_pVTIterator->GetSection(section))
         {
                 section.rcSection = m_pEdit->VTToEdit(section.rcSection);
                 return TRUE;
         }
-
         return FALSE;
 }
 
 void CFX_Edit_Iterator::SetAt(int32_t nWordIndex)
 {
-        ASSERT(m_pVTIterator != NULL);
-
         m_pVTIterator->SetAt(nWordIndex);
 }
 
 void CFX_Edit_Iterator::SetAt(const CPVT_WordPlace & place)
 {
-        ASSERT(m_pVTIterator != NULL);
-
         m_pVTIterator->SetAt(place);
 }
 
 const CPVT_WordPlace & CFX_Edit_Iterator::GetAt() const
 {
-        ASSERT(m_pVTIterator != NULL);
-
         return m_pVTIterator->GetAt();
 }
 
 IFX_Edit* CFX_Edit_Iterator::GetEdit() const
 {
         return m_pEdit;
 }
 
 /* --------------------------- CFX_Edit_Provider ------------------------------- */
 
@@ skipping 292 matching lines @@
         }
 
         m_UndoItemStack.Add(pItem);
         m_nCurUndoPos = m_UndoItemStack.GetSize();
 
         m_bModified = (m_nCurUndoPos != 0);
 }
 
 FX_BOOL CFX_Edit_Undo::IsModified() const
 {
-        if (m_bVirgin)
-                return m_bModified;
-        else
-                return TRUE;
+        return m_bVirgin ? m_bModified : TRUE;
 }
 
 IFX_Edit_UndoItem* CFX_Edit_Undo::GetItem(int32_t nIndex)
 {
         if (nIndex>=0 && nIndex < m_UndoItemStack.GetSize())
                 return m_UndoItemStack.GetAt(nIndex);
 
         return NULL;
 }
 
@@ skipping 3121 matching lines @@
         }
 }
 
 void CFX_Edit::AddUndoItem(IFX_Edit_UndoItem* pUndoItem)
 {
         m_Undo.AddItem(pUndoItem);
         if (m_bOprNotify && m_pOprNotify)
                 m_pOprNotify->OnAddUndo(pUndoItem);
 }