Fix else-after-returns throughout pdfium.

fpdfsdk/src/javascript/Field.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/javascript/JavaScript.h"
 #include "../../include/javascript/IJavaScript.h"
 #include "../../include/javascript/JS_Define.h"
 #include "../../include/javascript/JS_Object.h"
@@ skipping 347 matching lines @@
         {
                 if (csOptLabel.Compare(pFormField->GetOptionLabel(i)) == 0)
                         return TRUE;
         }
 
         return FALSE;
 }
 
 CPDF_FormControl* Field::GetSmartFieldControl(CPDF_FormField* pFormField)
 {
-        ASSERT(pFormField != NULL);
-        if(!pFormField->CountControls() || m_nFormControlIndex>=pFormField->CountControls()) return NULL;
+        if (!pFormField->CountControls() || m_nFormControlIndex >= pFormField->CountControls())
+        return NULL;
 
-        if (m_nFormControlIndex<0)
+        if (m_nFormControlIndex < 0)
                 return pFormField->GetControl(0);
-        else
-                return pFormField->GetControl(m_nFormControlIndex);
+
+    return pFormField->GetControl(m_nFormControlIndex);
 }
 
 /* ---------------------------------------- property ---------------------------------------- */
 
 FX_BOOL Field::alignment(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         ASSERT(m_pDocument != NULL);
 
         if (vp.IsSetting())
         {
@@ skipping 1151 matching lines @@
 
         return TRUE;
 }
 
 FX_BOOL Field::exportValues(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         ASSERT(m_pDocument != NULL);
 
         CFX_PtrArray FieldArray;
         GetFormFields(m_FieldName,FieldArray);
-        if (FieldArray.GetSize() <= 0) return FALSE;
+        if (FieldArray.GetSize() <= 0)
+        return FALSE;
 
         CPDF_FormField* pFormField = (CPDF_FormField*)FieldArray.ElementAt(0);
-        ASSERT(pFormField != NULL);
-
         if (pFormField->GetFieldType() != FIELDTYPE_CHECKBOX &&
                 pFormField->GetFieldType() != FIELDTYPE_RADIOBUTTON)
                 return FALSE;
 
         if (vp.IsSetting())
         {
-                if (!m_bCanSet) return FALSE;
-                if (!vp.IsArrayObject())return FALSE;
+                if (!m_bCanSet)
+            return FALSE;
+
+                if (!vp.IsArrayObject())
+            return FALSE;
         }
         else
         {
                 CJS_Array ExportValusArray(m_isolate);
-
                 if (m_nFormControlIndex < 0)
                 {
                         for (int i=0,sz=pFormField->CountControls(); i<sz; i++)
                         {
                                 CPDF_FormControl* pFormControl = pFormField->GetControl(i);
-                                ASSERT(pFormControl != NULL);
-
                                 ExportValusArray.SetElement(i, CJS_Value(m_isolate,pFormControl->GetExportValue().c_str()));
                         }
                 }
                 else
                 {
-                        if(m_nFormControlIndex >= pFormField->CountControls()) return FALSE;
+                        if (m_nFormControlIndex >= pFormField->CountControls())
+                return FALSE;
+
                         CPDF_FormControl* pFormControl = pFormField->GetControl(m_nFormControlIndex);
-                        if (!pFormControl) return FALSE;
+                        if (!pFormControl)
+                return FALSE;
 
                         ExportValusArray.SetElement(0, CJS_Value(m_isolate,pFormControl->GetExportValue().c_str()));
                 }
-
                 vp << ExportValusArray;
         }
-
         return TRUE;
 }
 
 FX_BOOL Field::fileSelect(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         ASSERT(m_pDocument != NULL);
 
         CFX_PtrArray FieldArray;
         GetFormFields(m_FieldName, FieldArray);
-        if (FieldArray.GetSize() <= 0) return FALSE;
+        if (FieldArray.GetSize() <= 0)
+        return FALSE;
 
         CPDF_FormField* pFormField = (CPDF_FormField*)FieldArray.ElementAt(0);
-        ASSERT(pFormField != NULL);
-
         if (pFormField->GetFieldType() != FIELDTYPE_TEXTFIELD)
                 return FALSE;
 
         if (vp.IsSetting())
         {
-                if (!m_bCanSet) return FALSE;
+                if (!m_bCanSet)
+            return FALSE;
 
                 bool bVP;
                 vp >> bVP;
-
         }
         else
         {
                 if (pFormField->GetFieldFlags() & FIELDFLAG_FILESELECT)
                         vp << true;
                 else
                         vp << false;
         }
-
         return TRUE;
 }
 
 FX_BOOL Field::fillColor(IFXJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError)
 {
         ASSERT(m_pDocument != NULL);
 
         CJS_Array crArray(m_isolate);
 
         CFX_PtrArray FieldArray;
-        GetFormFields(m_FieldName,FieldArray);
-        if (FieldArray.GetSize() <= 0) return FALSE;
+        GetFormFields(m_FieldName, FieldArray);
+        if (FieldArray.GetSize() <= 0)
+        return FALSE;
 
         if (vp.IsSetting())
         {
-                if (!m_bCanSet) return FALSE;
-                if (!vp.IsArrayObject()) return FALSE;
+                if (!m_bCanSet)
+            return FALSE;
+
+                if (!vp.IsArrayObject())
+            return FALSE;
 
                 vp >> crArray;
 
                 CPWL_Color color;
                 color::ConvertArrayToPWLColor(crArray, color);
-
                 if (m_bDelay)
                 {
                         AddDelay_Color(FP_FILLCOLOR, color);
                 }
                 else
                 {
                         Field::SetFillColor(m_pDocument, m_FieldName, m_nFormControlIndex, color);
                 }
         }
         else
         {
                 CPDF_FormField* pFormField = (CPDF_FormField*)FieldArray.ElementAt(0);
                 ASSERT(pFormField != NULL);
 
                 CPDF_FormControl* pFormControl = GetSmartFieldControl(pFormField);
-                if (!pFormControl)return FALSE;
+                if (!pFormControl)
+            return FALSE;
 
                 int iColorType;
                 pFormControl->GetBackgroundColor(iColorType);
 
                 CPWL_Color color;
-
                 if (iColorType == COLORTYPE_TRANSPARENT)
                 {
                         color = CPWL_Color(COLORTYPE_TRANSPARENT);
                 }
                 else if (iColorType == COLORTYPE_GRAY)
                 {
                         color = CPWL_Color(COLORTYPE_GRAY, pFormControl->GetOriginalBackgroundColor(0));
                 }
                 else if (iColorType == COLORTYPE_RGB)
                 {
@@ skipping 2432 matching lines @@
 
 #define JS_FIELD_MINWIDTH       1
 #define JS_FIELD_MINHEIGHT      1
 
 void Field::AddField(CPDFSDK_Document* pDocument, int nPageIndex, int nFieldType,
                                                         const CFX_WideString& sName, const CPDF_Rect& rcCoords)
 {
         //Not supported.
 }