commit 96660d6f382204339d6b1aadc3913303d436e252
author Lei Zhang <thestig@chromium.org> Mon Dec 14 18:27:25 2015 -0800
committer Lei Zhang <thestig@chromium.org> Mon Dec 14 18:27:25 2015 -0800
tree b5f84756e1a89251831cebc05b9d4e1f6cb2027b
parent d983b09c3ae29a97cba8e9ec9c6351545f6087ee

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

TBR=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1512763013 .

(cherry picked from commit e3c7c2b54348da4a6939f6672f6c6bff126815a7)

Review URL: https://codereview.chromium.org/1529553003 .

fpdfsdk/src/javascript/JS_GlobalData.cpp

diff --git a/fpdfsdk/src/javascript/JS_GlobalData.cpp b/fpdfsdk/src/javascript/JS_GlobalData.cpp
index d9a07a8..474886c 100644
--- a/fpdfsdk/src/javascript/JS_GlobalData.cpp
+++ b/fpdfsdk/src/javascript/JS_GlobalData.cpp
@@ -23,8 +23,6 @@
   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;
@@ -141,19 +139,15 @@
 
 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();
@@ -174,7 +168,7 @@
 
 void CJS_GlobalData::SetGlobalVariableBoolean(const FX_CHAR* propname,
                                               bool bData) {
-  ASSERT(propname != NULL);
+  ASSERT(propname);
   CFX_ByteString sPropName = propname;
 
   sPropName.TrimLeft();
@@ -198,7 +192,7 @@
 
 void CJS_GlobalData::SetGlobalVariableString(const FX_CHAR* propname,
                                              const CFX_ByteString& sData) {
-  ASSERT(propname != NULL);
+  ASSERT(propname);
   CFX_ByteString sPropName = propname;
 
   sPropName.TrimLeft();
@@ -223,7 +217,7 @@
 void CJS_GlobalData::SetGlobalVariableObject(
     const FX_CHAR* propname,
     const CJS_GlobalVariableArray& array) {
-  ASSERT(propname != NULL);
+  ASSERT(propname);
   CFX_ByteString sPropName = propname;
 
   sPropName.TrimLeft();
@@ -246,7 +240,7 @@
 }
 
 void CJS_GlobalData::SetGlobalVariableNull(const FX_CHAR* propname) {
-  ASSERT(propname != NULL);
+  ASSERT(propname);
   CFX_ByteString sPropName = propname;
 
   sPropName.TrimLeft();
@@ -268,7 +262,7 @@
 
 FX_BOOL CJS_GlobalData::SetGlobalVariablePersistent(const FX_CHAR* propname,
                                                     FX_BOOL bPersistent) {
-  ASSERT(propname != NULL);
+  ASSERT(propname);
   CFX_ByteString sPropName = propname;
 
   sPropName.TrimLeft();
@@ -286,7 +280,7 @@
 }
 
 FX_BOOL CJS_GlobalData::DeleteGlobalVariable(const FX_CHAR* propname) {
-  ASSERT(propname != NULL);
+  ASSERT(propname);
   CFX_ByteString sPropName = propname;
 
   sPropName.TrimLeft();
@@ -409,8 +403,6 @@
 
   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);