Merge to XFA: Get rid of most instance of 'foo != NULL'

fpdfsdk/src/javascript/JS_GlobalData.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 "JS_GlobalData.h"
 
 #include "core/include/fdrm/fx_crypt.h"
 #include "fpdfsdk/include/javascript/IJavaScript.h"
 
 #define JS_MAXGLOBALDATA (1024 * 4 - 8)
 
 /* --------------------- CJS_GlobalVariableArray --------------------- */
 
 CJS_GlobalVariableArray::CJS_GlobalVariableArray() {}
 
 CJS_GlobalVariableArray::~CJS_GlobalVariableArray() {
   Empty();
 }
 
 void CJS_GlobalVariableArray::Copy(const CJS_GlobalVariableArray& array) {
   Empty();
   for (int i = 0, sz = array.Count(); i < sz; i++) {
     CJS_KeyValue* pOldObjData = array.GetAt(i);
-    ASSERT(pOldObjData != NULL);
-
     switch (pOldObjData->nType) {
       case JS_GLOBALDATA_TYPE_NUMBER: {
         CJS_KeyValue* pNewObjData = new CJS_KeyValue;
         pNewObjData->sKey = pOldObjData->sKey;
         pNewObjData->nType = pOldObjData->nType;
         pNewObjData->dData = pOldObjData->dData;
         Add(pNewObjData);
       } break;
       case JS_GLOBALDATA_TYPE_BOOLEAN: {
         CJS_KeyValue* pNewObjData = new CJS_KeyValue;
@@ skipping 96 matching lines @@
   for (int i = 0, sz = m_arrayGlobalData.GetSize(); i < sz; i++) {
     CJS_GlobalData_Element* pTemp = m_arrayGlobalData.GetAt(i);
     if (pTemp->data.sKey[0] == *propname && pTemp->data.sKey == propname)
       return i;
   }
   return -1;
 }
 
 CJS_GlobalData_Element* CJS_GlobalData::GetGlobalVariable(
     const FX_CHAR* propname) {
-  ASSERT(propname != NULL);
+  ASSERT(propname);
 
   int nFind = FindGlobalVariable(propname);
-  if (nFind >= 0)
-    return m_arrayGlobalData.GetAt(nFind);
-
-  return NULL;
+  return nFind >= 0 ? m_arrayGlobalData.GetAt(nFind) : nullptr;
 }
 
 void CJS_GlobalData::SetGlobalVariableNumber(const FX_CHAR* propname,
                                              double dData) {
-  ASSERT(propname != NULL);
-
+  ASSERT(propname);
   CFX_ByteString sPropName = propname;
   sPropName.TrimLeft();
   sPropName.TrimRight();
   if (sPropName.GetLength() == 0)
     return;
 
   if (CJS_GlobalData_Element* pData = GetGlobalVariable(sPropName)) {
     pData->data.nType = JS_GLOBALDATA_TYPE_NUMBER;
     pData->data.dData = dData;
   } else {
     CJS_GlobalData_Element* pNewData = new CJS_GlobalData_Element;
     pNewData->data.sKey = sPropName;
     pNewData->data.nType = JS_GLOBALDATA_TYPE_NUMBER;
     pNewData->data.dData = dData;
     m_arrayGlobalData.Add(pNewData);
   }
 }
 
 void CJS_GlobalData::SetGlobalVariableBoolean(const FX_CHAR* propname,
                                               bool bData) {
-  ASSERT(propname != NULL);
+  ASSERT(propname);
   CFX_ByteString sPropName = propname;
 
   sPropName.TrimLeft();
   sPropName.TrimRight();
 
   if (sPropName.GetLength() == 0)
     return;
 
   if (CJS_GlobalData_Element* pData = GetGlobalVariable(sPropName)) {
     pData->data.nType = JS_GLOBALDATA_TYPE_BOOLEAN;
     pData->data.bData = bData;
   } else {
     CJS_GlobalData_Element* pNewData = new CJS_GlobalData_Element;
     pNewData->data.sKey = sPropName;
     pNewData->data.nType = JS_GLOBALDATA_TYPE_BOOLEAN;
     pNewData->data.bData = bData;
 
     m_arrayGlobalData.Add(pNewData);
   }
 }
 
 void CJS_GlobalData::SetGlobalVariableString(const FX_CHAR* propname,
                                              const CFX_ByteString& sData) {
-  ASSERT(propname != NULL);
+  ASSERT(propname);
   CFX_ByteString sPropName = propname;
 
   sPropName.TrimLeft();
   sPropName.TrimRight();
 
   if (sPropName.GetLength() == 0)
     return;
 
   if (CJS_GlobalData_Element* pData = GetGlobalVariable(sPropName)) {
     pData->data.nType = JS_GLOBALDATA_TYPE_STRING;
     pData->data.sData = sData;
   } else {
     CJS_GlobalData_Element* pNewData = new CJS_GlobalData_Element;
     pNewData->data.sKey = sPropName;
     pNewData->data.nType = JS_GLOBALDATA_TYPE_STRING;
     pNewData->data.sData = sData;
 
     m_arrayGlobalData.Add(pNewData);
   }
 }
 
 void CJS_GlobalData::SetGlobalVariableObject(
     const FX_CHAR* propname,
     const CJS_GlobalVariableArray& array) {
-  ASSERT(propname != NULL);
+  ASSERT(propname);
   CFX_ByteString sPropName = propname;
 
   sPropName.TrimLeft();
   sPropName.TrimRight();
 
   if (sPropName.GetLength() == 0)
     return;
 
   if (CJS_GlobalData_Element* pData = GetGlobalVariable(sPropName)) {
     pData->data.nType = JS_GLOBALDATA_TYPE_OBJECT;
     pData->data.objData.Copy(array);
   } else {
     CJS_GlobalData_Element* pNewData = new CJS_GlobalData_Element;
     pNewData->data.sKey = sPropName;
     pNewData->data.nType = JS_GLOBALDATA_TYPE_OBJECT;
     pNewData->data.objData.Copy(array);
 
     m_arrayGlobalData.Add(pNewData);
   }
 }
 
 void CJS_GlobalData::SetGlobalVariableNull(const FX_CHAR* propname) {
-  ASSERT(propname != NULL);
+  ASSERT(propname);
   CFX_ByteString sPropName = propname;
 
   sPropName.TrimLeft();
   sPropName.TrimRight();
 
   if (sPropName.GetLength() == 0)
     return;
 
   if (CJS_GlobalData_Element* pData = GetGlobalVariable(sPropName)) {
     pData->data.nType = JS_GLOBALDATA_TYPE_NULL;
   } else {
     CJS_GlobalData_Element* pNewData = new CJS_GlobalData_Element;
     pNewData->data.sKey = sPropName;
     pNewData->data.nType = JS_GLOBALDATA_TYPE_NULL;
 
     m_arrayGlobalData.Add(pNewData);
   }
 }
 
 FX_BOOL CJS_GlobalData::SetGlobalVariablePersistent(const FX_CHAR* propname,
                                                     FX_BOOL bPersistent) {
-  ASSERT(propname != NULL);
+  ASSERT(propname);
   CFX_ByteString sPropName = propname;
 
   sPropName.TrimLeft();
   sPropName.TrimRight();
 
   if (sPropName.GetLength() == 0)
     return FALSE;
 
   if (CJS_GlobalData_Element* pData = GetGlobalVariable(sPropName)) {
     pData->bPersistent = bPersistent;
     return TRUE;
   }
 
   return FALSE;
 }
 
 FX_BOOL CJS_GlobalData::DeleteGlobalVariable(const FX_CHAR* propname) {
-  ASSERT(propname != NULL);
+  ASSERT(propname);
   CFX_ByteString sPropName = propname;
 
   sPropName.TrimLeft();
   sPropName.TrimRight();
 
   if (sPropName.GetLength() == 0)
     return FALSE;
 
   int nFind = FindGlobalVariable(sPropName);
 
@@ skipping 102 matching lines @@
     FX_Free(pBuffer);
   }
 }
 
 void CJS_GlobalData::SaveGlobalPersisitentVariables() {
   FX_DWORD nCount = 0;
   CFX_BinaryBuf sData;
 
   for (int i = 0, sz = m_arrayGlobalData.GetSize(); i < sz; i++) {
     CJS_GlobalData_Element* pElement = m_arrayGlobalData.GetAt(i);
-    ASSERT(pElement != NULL);
-
     if (pElement->bPersistent) {
       CFX_BinaryBuf sElement;
       MakeByteString(pElement->data.sKey, &pElement->data, sElement);
 
       if (sData.GetSize() + sElement.GetSize() > JS_MAXGLOBALDATA)
         break;
 
       sData.AppendBlock(sElement.GetBuffer(), sElement.GetSize());
       nCount++;
     }
@@ skipping 65 matching lines @@
     case JS_GLOBALDATA_TYPE_NULL: {
       FX_DWORD dwNameLen = (FX_DWORD)name.GetLength();
       sData.AppendBlock(&dwNameLen, sizeof(FX_DWORD));
       sData.AppendString(name);
       sData.AppendBlock(&wType, sizeof(FX_DWORD));
     } break;
     default:
       break;
   }
 }