FX_BOOL considered harmful, part 2.

fpdfsdk/src/javascript/global.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/IJavaScript.h"
 #include "../../include/javascript/JS_Context.h"
 #include "../../include/javascript/JS_Define.h"
 #include "../../include/javascript/JS_EventHandler.h"
@@ skipping 78 matching lines @@
 
 BEGIN_JS_STATIC_PROP(CJS_Global)
 END_JS_STATIC_PROP()
 
 BEGIN_JS_STATIC_METHOD(CJS_Global)
     JS_STATIC_METHOD_ENTRY(setPersistent)
 END_JS_STATIC_METHOD()
 
 IMPLEMENT_SPECIAL_JS_CLASS(CJS_Global, global_alternate, global);
 
-FX_BOOL CJS_Global::InitInstance(IFXJS_Context* cc)
+bool CJS_Global::InitInstance(IFXJS_Context* cc)
 {
     CJS_Context* pContext = (CJS_Context*)cc;
     ASSERT(pContext != NULL);
 
     global_alternate* pGlobal = (global_alternate*)GetEmbedObject();
     ASSERT(pGlobal != NULL);
 
     pGlobal->Initial(pContext->GetReaderApp());
 
-    return TRUE;
+    return true;
 };
 
 global_alternate::global_alternate(CJS_Object* pJSObject)
     : CJS_EmbedObj(pJSObject),
     m_pApp(NULL)
 {
 }
 
 global_alternate::~global_alternate(void)
 {
     DestroyGlobalPersisitentVariables();
     m_pApp->GetRuntimeFactory()->ReleaseGlobalData();
 }
 
 void global_alternate::Initial(CPDFDoc_Environment* pApp)
 {
     m_pApp = pApp;
     m_pGlobalData = pApp->GetRuntimeFactory()->NewGlobalData(pApp);
     UpdateGlobalPersistentVariables();
 }
 
-FX_BOOL global_alternate::QueryProperty(const FX_WCHAR* propname)
+bool global_alternate::QueryProperty(const FX_WCHAR* propname)
 {
     return CFX_WideString(propname) != L"setPersistent";
 }
 
-FX_BOOL global_alternate::DelProperty(IFXJS_Context* cc, const FX_WCHAR* propname, CFX_WideString& sError)
+bool global_alternate::DelProperty(IFXJS_Context* cc, const FX_WCHAR* propname, CFX_WideString& sError)
 {
     js_global_data* pData = NULL;
     CFX_ByteString sPropName = CFX_ByteString::FromUnicode(propname);
 
     if (m_mapGlobal.Lookup(sPropName, (void*&)pData))
     {
-        pData->bDeleted = TRUE;
-        return TRUE;
+        pData->bDeleted = true;
+        return true;
     }
 
-    return FALSE;
+    return false;
 }
 
-FX_BOOL global_alternate::DoProperty(IFXJS_Context* cc, const FX_WCHAR* propname, CJS_PropValue& vp, CFX_WideString& sError)
+bool global_alternate::DoProperty(IFXJS_Context* cc, const FX_WCHAR* propname, CJS_PropValue& vp, CFX_WideString& sError)
 {
     if (vp.IsSetting())
     {
         CFX_ByteString sPropName = CFX_ByteString::FromUnicode(propname);
         switch (vp.GetType())
         {
         case VT_number:
             {
                 double dData;
                 vp >> dData;
-                return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_NUMBER, dData, false, "", v8::Local<v8::Object>(), FALSE);
+                return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_NUMBER, dData, false, "", v8::Local<v8::Object>(), false);
             }
         case VT_boolean:
             {
                 bool bData;
                 vp >> bData;
-                return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_BOOLEAN, 0, bData, "", v8::Local<v8::Object>(), FALSE);
+                return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_BOOLEAN, 0, bData, "", v8::Local<v8::Object>(), false);
             }
         case VT_string:
             {
                 CFX_ByteString sData;
                 vp >> sData;
-                return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_STRING, 0, false, sData, v8::Local<v8::Object>(), FALSE);
+                return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_STRING, 0, false, sData, v8::Local<v8::Object>(), false);
             }
         case VT_object:
             {
                 JSObject pData;
                 vp >> pData;
-                return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_OBJECT, 0, false, "", pData, FALSE);
+                return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_OBJECT, 0, false, "", pData, false);
             }
         case VT_null:
             {
-                return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_NULL, 0, false, "", v8::Local<v8::Object>(), FALSE);
+                return SetGlobalVariables(sPropName, JS_GLOBALDATA_TYPE_NULL, 0, false, "", v8::Local<v8::Object>(), false);
             }
         case VT_undefined:
             {
                 DelProperty(cc, propname, sError);
-                return TRUE;
+                return true;
             }
         default:
             break;
         }
     }
     else
     {
         void* pVoid = nullptr;
         if (!m_mapGlobal.Lookup(CFX_ByteString::FromUnicode(propname), pVoid))
         {
             vp.SetNull();
-            return TRUE;
+            return true;
         }
         if (!pVoid)
         {
             vp.SetNull();
-            return TRUE;
+            return true;
         }
         js_global_data* pData = (js_global_data*)pVoid;
         if (pData->bDeleted)
-            return TRUE;
+            return true;
 
         switch (pData->nType)
         {
             case JS_GLOBALDATA_TYPE_NUMBER:
                 vp << pData->dData;
-                return TRUE;
+                return true;
             case JS_GLOBALDATA_TYPE_BOOLEAN:
                 vp << pData->bData;
-                return TRUE;
+                return true;
             case JS_GLOBALDATA_TYPE_STRING:
                 vp << pData->sData;
-                return TRUE;
+                return true;
             case JS_GLOBALDATA_TYPE_OBJECT:
                 {
                     v8::Local<v8::Object> obj = v8::Local<v8::Object>::New(vp.GetIsolate(),pData->pData);
                     vp << obj;
-                    return TRUE;
+                    return true;
                 }
             case JS_GLOBALDATA_TYPE_NULL:
                 vp.SetNull();
-                return TRUE;
+                return true;
             default:
                 break;
         }
     }
-    return FALSE;
+    return false;
 }
 
-FX_BOOL global_alternate::setPersistent(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
+bool global_alternate::setPersistent(IFXJS_Context* cc, const CJS_Parameters& params, CJS_Value& vRet, CFX_WideString& sError)
 {
     CJS_Context* pContext = static_cast<CJS_Context*>(cc);
     if (params.size() != 2)
     {
         sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
-        return FALSE;
+        return false;
     }
 
     CFX_ByteString sName = params[0].ToCFXByteString();
 
     js_global_data* pData = NULL;
     if (m_mapGlobal.Lookup(sName, (void*&)pData))
     {
         if (pData && !pData->bDeleted)
         {
             pData->bPersistent = params[1].ToBool();
-            return TRUE;
+            return true;
         }
     }
 
     sError = JSGetStringFromID(pContext, IDS_STRING_JSNOGLOBAL);
-    return FALSE;
+    return false;
 }
 
 void global_alternate::UpdateGlobalPersistentVariables()
 {
     ASSERT(m_pGlobalData != NULL);
 
     for (int i=0,sz=m_pGlobalData->GetSize(); i<sz; i++)
     {
         CJS_GlobalData_Element* pData = m_pGlobalData->GetAt(i);
         ASSERT(pData != NULL);
@@ skipping 202 matching lines @@
         CFX_ByteString name;
         js_global_data* pData = NULL;
         m_mapGlobal.GetNextAssoc(pos, name, (void*&)pData);
         delete pData;
     }
 
     m_mapGlobal.RemoveAll();
 }
 
 
-FX_BOOL global_alternate::SetGlobalVariables(const FX_CHAR* propname, int nType,
+bool global_alternate::SetGlobalVariables(const FX_CHAR* propname, int nType,
                 double dData, bool bData, const CFX_ByteString& sData, JSObject pData, bool bDefaultPersistent)
 {
-    if (propname == NULL) return FALSE;
+    if (propname == NULL) return false;
 
     js_global_data* pTemp = NULL;
     m_mapGlobal.Lookup(propname, (void*&)pTemp);
 
     if (pTemp)
     {
         if (pTemp->bDeleted || pTemp->nType != nType)
         {
             pTemp->dData = 0;
             pTemp->bData = 0;
             pTemp->sData = "";
             pTemp->nType = nType;
         }
 
-        pTemp->bDeleted = FALSE;
+        pTemp->bDeleted = false;
 
         switch (nType)
         {
         case JS_GLOBALDATA_TYPE_NUMBER:
             {
                 pTemp->dData = dData;
             }
             break;
         case JS_GLOBALDATA_TYPE_BOOLEAN:
             {
                 pTemp->bData = bData;
             }
             break;
         case JS_GLOBALDATA_TYPE_STRING:
             {
                 pTemp->sData = sData;
             }
             break;
         case JS_GLOBALDATA_TYPE_OBJECT:
             {
                 pTemp->pData.Reset(JS_GetRuntime(pData), pData);
             }
             break;
         case JS_GLOBALDATA_TYPE_NULL:
             break;
         default:
-            return FALSE;
+            return false;
         }
 
-        return TRUE;
+        return true;
     }
 
     js_global_data* pNewData = NULL;
 
     switch (nType)
     {
     case JS_GLOBALDATA_TYPE_NUMBER:
         {
             pNewData = new js_global_data;
             pNewData->nType = JS_GLOBALDATA_TYPE_NUMBER;
@@ skipping 26 matching lines @@
         }
         break;
     case JS_GLOBALDATA_TYPE_NULL:
         {
             pNewData = new js_global_data;
             pNewData->nType = JS_GLOBALDATA_TYPE_NULL;
             pNewData->bPersistent = bDefaultPersistent;
         }
         break;
     default:
-        return FALSE;
+        return false;
     }
 
     m_mapGlobal.SetAt(propname, (void*)pNewData);
 
-    return TRUE;
+    return true;
 }
 
 FXJSVALUETYPE GET_VALUE_TYPE(v8::Local<v8::Value> p)
 {
   const unsigned int nHash = JS_CalcHash(JS_GetTypeof(p));
 
   if (nHash == JSCONST_nUndefHash)
     return VT_undefined;
   if (nHash == JSCONST_nNullHash)
     return VT_null;
   if (nHash == JSCONST_nStringHash)
     return VT_string;
   if (nHash == JSCONST_nNumberHash)
     return VT_number;
   if (nHash == JSCONST_nBoolHash)
     return VT_boolean;
   if (nHash == JSCONST_nDateHash)
     return VT_date;
   if (nHash == JSCONST_nObjectHash)
     return VT_object;
   if (nHash == JSCONST_nFXobjHash)
     return VT_fxobject;
 
   return VT_unknown;
 }