Fix else-after-returns throughout pdfium.

fpdfsdk/src/fsdk_baseform.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 "../../third_party/base/nonstd_unique_ptr.h"
 #include "../include/fsdk_define.h"
 #include "../include/fsdk_mgr.h"
 #include "../include/fsdk_baseannot.h"
@@ skipping 48 matching lines @@
         switch (nFieldType)
         {
         case FIELDTYPE_PUSHBUTTON:
         case FIELDTYPE_COMBOBOX:
         case FIELDTYPE_LISTBOX:
         case FIELDTYPE_TEXTFIELD:
         case FIELDTYPE_SIGNATURE:
                 return psub->GetType() == PDFOBJ_STREAM;
         case FIELDTYPE_CHECKBOX:
         case FIELDTYPE_RADIOBUTTON:
-                if (psub->GetType() == PDFOBJ_DICTIONARY)
-                {
+                if (psub->GetType() == PDFOBJ_DICTIONARY) {
                         CPDF_Dictionary* pSubDict = (CPDF_Dictionary*)psub;
-
                         return pSubDict->GetStream(GetAppState()) != NULL;
                 }
-                else
-                        return FALSE;
-                break;
+        return FALSE;
         }
 
         return TRUE;
 }
 
 int     CPDFSDK_Widget::GetFieldType() const
 {
         CPDF_FormField* pField = GetFormField();
         ASSERT(pField != NULL);
 
@@ skipping 1260 matching lines @@
         return CPWL_Utils::DeflateRect(rcWindow, fBorderWidth);
 }
 
 CPDF_Rect CPDFSDK_Widget::GetRotatedRect() const
 {
         CPDF_Rect rectAnnot = GetRect();
         FX_FLOAT fWidth = rectAnnot.right - rectAnnot.left;
         FX_FLOAT fHeight = rectAnnot.top - rectAnnot.bottom;
 
         CPDF_FormControl* pControl = GetFormControl();
-        ASSERT(pControl != NULL);
-
         CPDF_Rect rcPDFWindow;
         switch(abs(pControl->GetRotation() % 360))
         {
                 case 0:
                 case 180:
                 default:
                         rcPDFWindow = CPDF_Rect(0, 0, fWidth, fHeight);
                         break;
                 case 90:
                 case 270:
                         rcPDFWindow = CPDF_Rect(0, 0, fHeight, fWidth);
                         break;
         }
 
         return rcPDFWindow;
 }
 
 CFX_ByteString CPDFSDK_Widget::GetBackgroundAppStream() const
 {
         CPWL_Color crBackground = GetFillPWLColor();
-        if (crBackground.nColorType != COLORTYPE_TRANSPARENT)
+        if (crBackground.nColorType != COLORTYPE_TRANSPARENT) {
                 return CPWL_Utils::GetRectFillAppStream(GetRotatedRect(), crBackground);
-        else
-                return "";
+    }
+    return "";
 }
 
 CFX_ByteString CPDFSDK_Widget::GetBorderAppStream() const
 {
         CPDF_Rect rcWindow = GetRotatedRect();
         CPWL_Color crBorder = GetBorderPWLColor();
         CPWL_Color crBackground = GetFillPWLColor();
         CPWL_Color crLeftTop, crRightBottom;
 
         FX_FLOAT fBorderWidth = (FX_FLOAT)GetBorderWidth();
@@ skipping 752 matching lines @@
                                 bChanged = TRUE;
                         }
                 }
         }
 
         return bChanged;
 }
 
 FX_BOOL CPDFSDK_InterForm::DoAction_SubmitForm(const CPDF_Action& action)
 {
-        ASSERT(action);
         ASSERT(m_pInterForm != NULL);
-
         CFX_WideString sDestination = action.GetFilePath();
-        if (sDestination.IsEmpty()) return FALSE;
+        if (sDestination.IsEmpty())
+        return FALSE;
 
         CPDF_Dictionary* pActionDict = action.GetDict();
         if (pActionDict->KeyExist("Fields"))
         {
                 CPDF_ActionFields af = action.GetWidgets();
                 FX_DWORD dwFlags = action.GetFlags();
-
                 CFX_PtrArray fieldObjects;
                 af.GetAllFields(fieldObjects);
+
                 CFX_PtrArray fields;
                 GetFieldFromObjects(fieldObjects, fields);
-
                 if (fields.GetSize() != 0)
                 {
                         FX_BOOL bIncludeOrExclude = !(dwFlags & 0x01);
                         if (m_pInterForm->CheckRequiredFields(&fields, bIncludeOrExclude))
-                        {
                                 return FALSE;
-                        }
+
                         return SubmitFields(sDestination, fields, bIncludeOrExclude, FALSE);
                 }
-                else
-                {
-                        if ( m_pInterForm->CheckRequiredFields())
-                        {
-                                return FALSE;
-                        }
+    }
+    if (m_pInterForm->CheckRequiredFields())
+        return FALSE;
 
-                        return SubmitForm(sDestination, FALSE);
-                }
-        }
-        else
-        {
-                if ( m_pInterForm->CheckRequiredFields())
-                {
-                        return FALSE;
-                }
-
-                return SubmitForm(sDestination, FALSE);
-        }
+    return SubmitForm(sDestination, FALSE);
 }
 
 FX_BOOL CPDFSDK_InterForm::SubmitFields(const CFX_WideString& csDestination, const CFX_PtrArray& fields,
                                                                         FX_BOOL bIncludeOrExclude, FX_BOOL bUrlEncoded)
 {
         CPDFDoc_Environment* pEnv = m_pDocument->GetEnv();
         ASSERT(pEnv != NULL);
 
         CFX_ByteTextBuf textBuf;
         ExportFieldsToFDFTextBuf(fields, bIncludeOrExclude, textBuf);
@@ skipping 216 matching lines @@
                         if (m_pInterForm->IsValidFormField(pObject))
                                 fields.Add(pObject);
                 }
         }
 }
 
 /* ----------------------------- CPDF_FormNotify ----------------------------- */
 
 int     CPDFSDK_InterForm::BeforeValueChange(const CPDF_FormField* pField, CFX_WideString& csValue)
 {
-        ASSERT(pField != NULL);
-
         CPDF_FormField* pFormField = (CPDF_FormField*)pField;
-
         int nType = pFormField->GetFieldType();
         if (nType == FIELDTYPE_COMBOBOX || nType == FIELDTYPE_TEXTFIELD)
         {
                 FX_BOOL bRC = TRUE;
                 OnKeyStrokeCommit(pFormField, csValue, bRC);
                 if (bRC)
                 {
                         OnValidate(pFormField, csValue, bRC);
-                        if (bRC)
-                                return 1;
-                        else
-                                return -1;
-                }
-                else
-                        return -1;
+                        return bRC ? 1 : -1;
+        }
+        return -1;
         }
-        else
-                return 0;
+    return 0;
 }
 
 int     CPDFSDK_InterForm::AfterValueChange(const CPDF_FormField* pField)
 {
-        ASSERT(pField != NULL);
-
         CPDF_FormField* pFormField = (CPDF_FormField*)pField;
         int nType = pFormField->GetFieldType();
-
         if (nType == FIELDTYPE_COMBOBOX || nType == FIELDTYPE_TEXTFIELD)
         {
                 OnCalculate(pFormField);
                 FX_BOOL bFormated = FALSE;
                 CFX_WideString sValue = OnFormat(pFormField, bFormated);
                 if (bFormated)
                         ResetFieldAppearance(pFormField, sValue.c_str(), TRUE);
                 else
                         ResetFieldAppearance(pFormField, NULL, TRUE);
                 UpdateField(pFormField);
         }
-
         return 0;
 }
 
 int     CPDFSDK_InterForm::BeforeSelectionChange(const CPDF_FormField* pField, CFX_WideString& csValue)
 {
-        ASSERT(pField != NULL);
+        CPDF_FormField* pFormField = (CPDF_FormField*)pField;
+        if (pFormField->GetFieldType() != FIELDTYPE_LISTBOX)
+                return 0;
 
-        CPDF_FormField* pFormField = (CPDF_FormField*)pField;
+    FX_BOOL bRC = TRUE;
+    OnKeyStrokeCommit(pFormField, csValue, bRC);
+    if (!bRC)
+        return -1;
 
-        int nType = pFormField->GetFieldType();
-        if (nType == FIELDTYPE_LISTBOX)
-        {
-                FX_BOOL bRC = TRUE;
-                OnKeyStrokeCommit(pFormField, csValue, bRC);
-                if (bRC)
-                {
-                        OnValidate(pFormField, csValue, bRC);
-                        if (bRC)
-                                return 1;
-                        else
-                                return -1;
-                }
-                else
-                        return -1;
-        }
-        else
-                return 0;
+    OnValidate(pFormField, csValue, bRC);
+    if (!bRC)
+        return -1;
+
+    return 1;
 }
 
 int     CPDFSDK_InterForm::AfterSelectionChange(const CPDF_FormField* pField)
 {
-        ASSERT(pField != NULL);
-
         CPDF_FormField* pFormField = (CPDF_FormField*)pField;
-        int nType = pFormField->GetFieldType();
-
-        if (nType == FIELDTYPE_LISTBOX)
+        if (pFormField->GetFieldType() == FIELDTYPE_LISTBOX)
         {
                 OnCalculate(pFormField);
                 ResetFieldAppearance(pFormField, NULL, TRUE);
                 UpdateField(pFormField);
         }
-
         return 0;
 }
 
 int     CPDFSDK_InterForm::AfterCheckedStatusChange(const CPDF_FormField* pField, const CFX_ByteArray& statusArray)
 {
-        ASSERT(pField != NULL);
-
         CPDF_FormField* pFormField = (CPDF_FormField*)pField;
         int nType = pFormField->GetFieldType();
-
         if (nType == FIELDTYPE_CHECKBOX || nType == FIELDTYPE_RADIOBUTTON)
         {
                 OnCalculate(pFormField);
                 UpdateField(pFormField);
         }
-
         return 0;
 }
 
 int     CPDFSDK_InterForm::BeforeFormReset(const CPDF_InterForm* pForm)
 {
         return 0;
 }
 
 int     CPDFSDK_InterForm::AfterFormReset(const CPDF_InterForm* pForm)
 {
@@ skipping 42 matching lines @@
                         m_aHighlightColor[nFieldType-1] = clr;
                         m_bNeedHightlight[nFieldType-1] = TRUE;
                         break;
                 }
         }
 
 }
 
 FX_COLORREF CPDFSDK_InterForm::GetHighlightColor(int nFieldType)
 {
-        if(nFieldType <0 || nFieldType >6) return FXSYS_RGB(255,255,255);
-        if(nFieldType == 0)
+        if (nFieldType < 0 || nFieldType > 6)
+        return FXSYS_RGB(255,255,255);
+        if (nFieldType == 0)
                 return m_aHighlightColor[0];
-        else
-                return m_aHighlightColor[nFieldType-1];
+    return m_aHighlightColor[nFieldType-1];
 }
 
 /* ------------------------- CBA_AnnotIterator ------------------------- */
 
 CBA_AnnotIterator::CBA_AnnotIterator(CPDFSDK_PageView* pPageView, const CFX_ByteString& sType, const CFX_ByteString& sSubType)
         :m_pPageView(pPageView),
         m_sType(sType),
         m_sSubType(sSubType),
         m_nTabs(BAI_STRUCTURE)
 {
@@ skipping 37 matching lines @@
 CPDFSDK_Annot* CBA_AnnotIterator::GetLastAnnot()
 {
         if (m_Annots.GetSize() > 0)
                 return m_Annots[m_Annots.GetSize() - 1];
 
         return NULL;
 }
 
 CPDFSDK_Annot* CBA_AnnotIterator::GetNextAnnot(CPDFSDK_Annot* pAnnot)
 {
-        for (int i=0,sz=m_Annots.GetSize(); i<sz; i++)
-        {
+        for (int i = 0, sz = m_Annots.GetSize(); i < sz; ++i) {
                 if (m_Annots[i] == pAnnot)
-                {
-                        if (i+1 < sz)
-                                return m_Annots[i+1];
-                        else
-                                return m_Annots[0];
-                }
-        }
-
+                        return (i + 1 < sz) ? m_Annots[i+1] : m_Annots[0];
+    }
         return NULL;
 }
 
 CPDFSDK_Annot* CBA_AnnotIterator::GetPrevAnnot(CPDFSDK_Annot* pAnnot)
 {
-        for (int i=0,sz=m_Annots.GetSize(); i<sz; i++)
-        {
+        for (int i = 0, sz = m_Annots.GetSize(); i < sz; ++i) {
                 if (m_Annots[i] == pAnnot)
-                {
-                        if (i-1 >= 0)
-                                return m_Annots[i-1];
-                        else
-                                return m_Annots[sz-1];
-                }
+                        return (i - 1 >= 0) ? m_Annots[i-1] : m_Annots[sz-1];
         }
-
         return NULL;
 }
 
 int CBA_AnnotIterator::CompareByLeft(CPDFSDK_Annot* p1, CPDFSDK_Annot* p2)
 {
-        ASSERT(p1 != NULL);
-        ASSERT(p2 != NULL);
+        ASSERT(p1);
+        ASSERT(p2);
 
         CPDF_Rect rcAnnot1 = GetAnnotRect(p1);
         CPDF_Rect rcAnnot2 = GetAnnotRect(p2);
 
         if (rcAnnot1.left < rcAnnot2.left)
                 return -1;
         if (rcAnnot1.left > rcAnnot2.left)
                 return 1;
         return 0;
 }
@@ skipping 228 matching lines @@
 
         CPDF_Annot* pPDFAnnot = pAnnot->GetPDFAnnot();
         ASSERT(pPDFAnnot != NULL);
 
         CPDF_Rect rcAnnot;
         pPDFAnnot->GetRect(rcAnnot);
 
         return rcAnnot;
 }