Get rid of NULLs in core/

core/fxcrt/fx_basic_maps.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 "core/fxcrt/include/fx_basic.h"
 #include "core/fxcrt/plex.h"
 
 CFX_MapPtrToPtr::CFX_MapPtrToPtr(int nBlockSize)
@@ skipping 58 matching lines @@
 }
 
 void* CFX_MapPtrToPtr::GetValueAt(void* key) const {
   uint32_t nHash;
   CAssoc* pAssoc = GetAssocAt(key, nHash);
   return pAssoc ? pAssoc->value : nullptr;
 }
 
 void*& CFX_MapPtrToPtr::operator[](void* key) {
   uint32_t nHash;
-  CAssoc* pAssoc;
-  if ((pAssoc = GetAssocAt(key, nHash)) == NULL) {
-    if (!m_pHashTable) {
+  CAssoc* pAssoc = GetAssocAt(key, nHash);
+  if (!pAssoc) {
+    if (!m_pHashTable)
       InitHashTable(m_nHashTableSize);
-    }
     pAssoc = NewAssoc();
     pAssoc->key = key;
     pAssoc->pNext = m_pHashTable[nHash];
     m_pHashTable[nHash] = pAssoc;
   }
   return pAssoc->value;
 }
 CFX_MapPtrToPtr::CAssoc* CFX_MapPtrToPtr::GetAssocAt(void* key,
                                                      uint32_t& nHash) const {
   nHash = HashKey(key) % m_nHashTableSize;
   if (!m_pHashTable) {
-    return NULL;
+    return nullptr;
   }
   CAssoc* pAssoc;
   for (pAssoc = m_pHashTable[nHash]; pAssoc; pAssoc = pAssoc->pNext) {
     if (pAssoc->key == key)
       return pAssoc;
   }
-  return NULL;
+  return nullptr;
 }
 CFX_MapPtrToPtr::CAssoc* CFX_MapPtrToPtr::NewAssoc() {
   if (!m_pFreeList) {
     CFX_Plex* newBlock = CFX_Plex::Create(m_pBlocks, m_nBlockSize,
                                           sizeof(CFX_MapPtrToPtr::CAssoc));
     CFX_MapPtrToPtr::CAssoc* pAssoc =
         (CFX_MapPtrToPtr::CAssoc*)newBlock->data();
     pAssoc += m_nBlockSize - 1;
     for (int i = m_nBlockSize - 1; i >= 0; i--, pAssoc--) {
       pAssoc->pNext = m_pFreeList;
       m_pFreeList = pAssoc;
     }
   }
   CFX_MapPtrToPtr::CAssoc* pAssoc = m_pFreeList;
   m_pFreeList = m_pFreeList->pNext;
   m_nCount++;
   ASSERT(m_nCount > 0);
   pAssoc->key = 0;
   pAssoc->value = 0;
   return pAssoc;
 }
 void CFX_MapPtrToPtr::InitHashTable(uint32_t nHashSize, FX_BOOL bAllocNow) {
   ASSERT(m_nCount == 0);
   ASSERT(nHashSize > 0);
   FX_Free(m_pHashTable);
-  m_pHashTable = NULL;
+  m_pHashTable = nullptr;
   if (bAllocNow) {
     m_pHashTable = FX_Alloc(CAssoc*, nHashSize);
   }
   m_nHashTableSize = nHashSize;
 }
 FX_BOOL CFX_MapPtrToPtr::RemoveKey(void* key) {
   if (!m_pHashTable) {
     return FALSE;
   }
   CAssoc** ppAssocPrev;
@@ skipping 11 matching lines @@
 }
 void CFX_MapPtrToPtr::FreeAssoc(CFX_MapPtrToPtr::CAssoc* pAssoc) {
   pAssoc->pNext = m_pFreeList;
   m_pFreeList = pAssoc;
   m_nCount--;
   ASSERT(m_nCount >= 0);
   if (m_nCount == 0) {
     RemoveAll();
   }
 }