FX_BOOL considered harmful.

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 81 matching lines @@
 #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;
+        bool bPercent = false;
         for (i=0; i<sFormat->length(); ++i)
         {
                 wchar_t c = (*sFormat)[i];
                 if (c == L'%')
                 {
                         bPercent = true;
                         continue;
                 }
 
                 if (bPercent)
@@ skipping 17 matching lines @@
                         {
                                 continue;
                         }
                         else break;
                 }
         }
 
         return -1;
 }
 
-FX_BOOL util::printf(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool util::printf(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         int iSize = params.size();
         if (iSize < 1)
-                return FALSE;
+                return false;
         std::wstring c_ConvChar(params[0].ToCFXWideString().c_str());
         std::vector<std::wstring> c_strConvers;
         int iOffset = 0;
         int iOffend = 0;
         c_ConvChar.insert(c_ConvChar.begin(),L'S');
         while(iOffset != -1)
         {
                 iOffend = c_ConvChar.find(L"%",iOffset+1);
                 std::wstring strSub;
                 if (iOffend == -1)
@@ skipping 37 matching lines @@
                                 break;
                         default:
                                 strSegment.Format(L"%S", c_strFormat.c_str());
                                 break;
                 }
                 c_strResult += strSegment.GetBuffer(strSegment.GetLength()+1);
         }
 
         c_strResult.erase(c_strResult.begin());
         vRet = c_strResult.c_str();
-        return TRUE;
+        return true;
 }
 
-FX_BOOL util::printd(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool util::printd(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         v8::Isolate* isolate = GetIsolate(cc);
 
         int iSize = params.size();
         if (iSize < 2)
-                return FALSE;
+                return false;
 
         CJS_Value p1(isolate);
         p1 = params[0];
 
         CJS_Value p2 = params[1];
         CJS_Date jsDate(isolate);
         if (!p2.ConvertToDate(jsDate))
         {
                 sError = JSGetStringFromID((CJS_Context*)cc, IDS_STRING_JSPRINT1);
-                return FALSE;
+                return false;
         }
 
         if (!jsDate.IsValidDate())
         {
                 sError = JSGetStringFromID((CJS_Context*)cc, IDS_STRING_JSPRINT2);
-                return FALSE;
+                return false;
         }
 
         if (p1.GetType() == VT_number)
         {
                 int nFormat = p1.ToInt();
                 CFX_WideString swResult;
 
                 switch (nFormat)
                 {
                 case 0:
@@ skipping 17 matching lines @@
                 case 2:
                         swResult.Format(L"%04d/%02d/%02d %02d:%02d:%02d",
                                 jsDate.GetYear(),
                                 jsDate.GetMonth() + 1,
                                 jsDate.GetDay(),
                                 jsDate.GetHours(),
                                 jsDate.GetMinutes(),
                                 jsDate.GetSeconds());
                         break;
                 default:
-                        return FALSE;
+                        return false;
                 }
 
                 vRet = swResult.c_str();
-                return TRUE;
+                return true;
         }
         else 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)
                 {
-                        return FALSE; //currently, it doesn't support XFAPicture.
+                        return false; //currently, it doesn't support XFAPicture.
                 }
 
         int iIndex;
                 for(iIndex = 0;iIndex<sizeof(fcTable)/sizeof(stru_TbConvert);iIndex++)
                 {
                         int iStart = 0;
                         int iEnd;
                         while((iEnd = cFormat.find(fcTable[iIndex].lpszJSMark, iStart)) != -1)
                         {
                                 cFormat.replace(iEnd, FXSYS_wcslen(fcTable[iIndex].lpszJSMark), fcTable[iIndex].lpszCppMark);
@@ skipping 64 matching lines @@
                 }
 
                 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 true;
         }
-        return FALSE;
+        return false;
 }
 
 void util::printd(const std::wstring &cFormat2, CJS_Date jsDate, bool bXFAPicture, std::wstring &cPurpose)
 {
         std::wstring cFormat = cFormat2;
 
         if (bXFAPicture)
         {
                 return ; //currently, it doesn't support XFAPicture.
         }
@@ skipping 72 matching lines @@
                 }
         }
 
         CFX_WideString strFormat;
         wchar_t buf[64] = {};
         strFormat = wcsftime(buf, 64, cFormat.c_str(), &time);
         cFormat = buf;
         cPurpose = cFormat;
 }
 
-FX_BOOL util::printx(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool util::printx(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         int iSize = params.size();
         if (iSize<2)
-                return FALSE;
+                return false;
         CFX_WideString sFormat = params[0].ToCFXWideString();
         CFX_WideString sSource = params[1].ToCFXWideString();
         std::string cFormat = CFX_ByteString::FromUnicode(sFormat).c_str();
         std::string cSource = CFX_ByteString::FromUnicode(sSource).c_str();
         std::string cDest;
         printx(cFormat,cSource,cDest);
         vRet = cDest.c_str();
-        return TRUE;
+        return true;
 }
 
 void util::printx(const std::string &cFormat,const std::string &cSource2,std::string &cPurpose)
 {
         std::string cSource(cSource2);
         if (!cPurpose.empty())
                 //cPurpose.clear();
                 cPurpose.erase();
         int itSource = 0;
         int iSize = cSource.size();
@@ skipping 81 matching lines @@
                 case '=':
                         break;
                 default:
                         //cPurpose.push_back(letter);
                         cPurpose += letter;
                         break;
                 }
         }
 }
 
-FX_BOOL util::scand(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool util::scand(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
         v8::Isolate* isolate = GetIsolate(cc);
         int iSize = params.size();
         if (iSize < 2)
-                return FALSE;
+                return false;
 
         CFX_WideString sFormat = params[0].ToCFXWideString();
         CFX_WideString sDate = params[1].ToCFXWideString();
         double dDate = JS_GetDateTime();
         if (sDate.GetLength() > 0)
         {
-                FX_BOOL bWrongFormat = FALSE;
+                bool bWrongFormat = false;
                 dDate = CJS_PublicMethods::MakeRegularDate(sDate,sFormat,bWrongFormat);
         }
 
         if (!JS_PortIsNan(dDate))
         {
                 CJS_Date date(isolate,dDate);
                 vRet = date;
         }
         else
         {
                 vRet.SetNull();
         }
 
-        return TRUE;
+        return true;
 }
 
 int64_t FX_atoi64(const char *nptr)
 {
         int c;              /* current char */
         int64_t total;      /* current total */
         int sign;           /* if '-', then negative, otherwise positive */
 
         /* skip whitespace */
         while ( isspace((int)(unsigned char)*nptr) )
@@ skipping 10 matching lines @@
             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 */
 }
 
-FX_BOOL util::byteToChar(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+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;
+                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;
+        return true;
 }