Fix else-after-returns throughout pdfium.

fpdfsdk/src/javascript/util.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 80 matching lines @@
         { L"h",  L"%l" },
 #endif
 };
 
 #define UTIL_INT                        0
 #define UTIL_DOUBLE                     1
 #define UTIL_STRING                     2
 
 int util::ParstDataType(std::wstring* sFormat)
 {
-        size_t i = 0;
         bool bPercent = FALSE;
-        for (i=0; i<sFormat->length(); ++i)
+        for (size_t i = 0; i < sFormat->length(); ++i)
         {
                 wchar_t c = (*sFormat)[i];
                 if (c == L'%')
                 {
                         bPercent = true;
                         continue;
                 }
 
                 if (bPercent)
                 {
                         if (c == L'c' || c == L'C' || c == L'd' || c == L'i' || c == L'o' || c == L'u' || c == L'x' || c == L'X')
-                        {
+            {
                                 return UTIL_INT;
                         }
-                        else if (c == L'e' || c == L'E' || c == L'f' || c == L'g' || c == L'G')
+                        if (c == L'e' || c == L'E' || c == L'f' || c == L'g' || c == L'G')
                         {
                                 return UTIL_DOUBLE;
                         }
-                        else if (c == L's' || c == L'S')
+                        if (c == L's' || c == L'S')
                         {
                                 // Map s to S since we always deal internally
                                 // with wchar_t strings.
                                 (*sFormat)[i] = L'S';
                                 return UTIL_STRING;
                         }
-                        else if (c == L'.' || c == L'+' || c == L'-' || c == L'#' || c == L' ' || CJS_PublicMethods::IsDigit(c))
+                        if (c == L'.' || c == L'+' || c == L'-' || c == L'#' || c == L' ' || CJS_PublicMethods::IsDigit(c))
                         {
                                 continue;
                         }
-                        else break;
+                        break;
                 }
         }
 
         return -1;
 }
 
 FX_BOOL util::printf(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         int iSize = params.size();
         if (iSize < 1)
@@ skipping 117 matching lines @@
                                 jsDate.GetMinutes(),
                                 jsDate.GetSeconds());
                         break;
                 default:
                         return FALSE;
                 }
 
                 vRet = swResult.c_str();
                 return TRUE;
         }
-        else if (p1.GetType() == VT_string)
+    if (p1.GetType() == VT_string)
         {
                 std::basic_string<wchar_t> cFormat = p1.ToCFXWideString().c_str();
 
                 bool bXFAPicture = false;
                 if (iSize > 2)
                 {
                         bXFAPicture = params[2].ToBool();
                 }
 
                 if (bXFAPicture)
@@ skipping 21 matching lines @@
                 iMin = jsDate.GetMinutes();
                 iSec = jsDate.GetSeconds();
 
                 struct tm time = {};
                 time.tm_year = iYear-1900;
                 time.tm_mon = iMonth;
                 time.tm_mday = iDay;
                 time.tm_hour = iHour;
                 time.tm_min = iMin;
                 time.tm_sec = iSec;
-                //COleDateTime cppTm(iYear,iMonth+1,iDay,iHour,iMin,iSec);
-                //CString strFormat = cppTm.Format(cFormat.c_str());
 
                 struct stru_TbConvertAd
                 {
                         const FX_WCHAR* lpszJSMark;
                         int     iValue;
                 };
 
                 stru_TbConvertAd cTableAd[] ={
                         { L"m", iMonth+1 },
                         { L"d", iDay },
                         { L"H", iHour },
                         { L"h", iHour>12?iHour-12:iHour },
                         { L"M", iMin },
                         { L"s", iSec },
                 };
 
-                //cFormat = strFormat.GetBuffer(strFormat.GetLength()+1);
                 for(iIndex = 0;iIndex<sizeof(cTableAd)/sizeof(stru_TbConvertAd);iIndex++)
                 {
                         wchar_t tszValue[10];
-                        //_itot(cTableAd[iIndex].iValue,tszValue,10);
                         CFX_WideString sValue;
                         sValue.Format(L"%d",cTableAd[iIndex].iValue);
                         memcpy(tszValue, (wchar_t *)sValue.GetBuffer(sValue.GetLength()+1),
                                (sValue.GetLength()+1)*sizeof(wchar_t));
 
-                        //strFormat.Replace(cTableAd[iIndex].lpszJSMark,"%d");
-                        //strFormat.Format(strFormat,cTableAd[iIndex].iValue);
                         int iStart = 0;
                         int iEnd;
                         while((iEnd = cFormat.find(cTableAd[iIndex].lpszJSMark, iStart)) != -1)
                         {
                                 if (iEnd > 0)
                                 {
                                         if (cFormat[iEnd-1] == L'%')
                                         {
                                                 iStart = iEnd+1;
                                                 continue;
                                         }
                                 }
                                 cFormat.replace(iEnd, FXSYS_wcslen(cTableAd[iIndex].lpszJSMark), tszValue);
                                 iStart = iEnd;
                         }
                 }
 
                 CFX_WideString strFormat;
-//              strFormat.Format(L"%d,%d,%d,%d,%d,%d",iYear, iMonth, iDay, iHour, iMin, iSec);
-//              CString strFormat = cppTm.Format(cFormat.c_str());
                 wchar_t buf[64] = {};
                 strFormat = wcsftime(buf, 64, cFormat.c_str(), &time);
                 cFormat = buf;
                 vRet = cFormat.c_str();
-                //rtRet = strFormat.GetBuffer(strFormat.GetLength()+1);
                 return TRUE;
         }
         return FALSE;
 }
 
 void util::printd(const std::wstring &cFormat2, CJS_Date jsDate, bool bXFAPicture, std::wstring &cPurpose)
 {
         std::wstring cFormat = cFormat2;
 
         if (bXFAPicture)
@@ skipping 240 matching lines @@
         if (c == '-' || c == '+')
             c = (int)(unsigned char)*nptr++;    /* skip sign */
 
         total = 0;
 
         while (isdigit(c)) {
             total = 10 * total + (c - '0');     /* accumulate digit */
             c = (int)(unsigned char)*nptr++;    /* get next char */
         }
 
-        if (sign == '-')
-            return -total;
-        else
-            return total;   /* return result, negated if necessary */
+        return sign == '-' ? -total : total;
 }
 
 FX_BOOL util::byteToChar(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         int iSize = params.size();
         if (iSize == 0)
                 return FALSE;
         int nByte = params[0].ToInt();
         unsigned char cByte = (unsigned char)nByte;
         CFX_WideString csValue;
         csValue.Format(L"%c", cByte);
         vRet = csValue.c_str();
         return TRUE;
 }