Get rid of most instance of 'foo == NULL'

core/src/fxcrt/fx_basic_list.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/include/fxcrt/fx_basic.h"
 #include "plex.h"
 
 CFX_PtrList::CFX_PtrList(int nBlockSize)
@@ skipping 19 matching lines @@
   pNewNode->data = newElement;
   if (m_pNodeHead) {
     m_pNodeHead->pPrev = pNewNode;
   } else {
     m_pNodeTail = pNewNode;
   }
   m_pNodeHead = pNewNode;
   return (FX_POSITION)pNewNode;
 }
 FX_POSITION CFX_PtrList::InsertAfter(FX_POSITION position, void* newElement) {
-  if (position == NULL) {
+  if (!position) {
     return AddTail(newElement);
   }
   CNode* pOldNode = (CNode*)position;
   CNode* pNewNode = NewNode(pOldNode, pOldNode->pNext);
   pNewNode->data = newElement;
   if (pOldNode->pNext) {
     pOldNode->pNext->pPrev = pNewNode;
   } else {
     m_pNodeTail = pNewNode;
   }
@@ skipping 23 matching lines @@
   }
 }
 void CFX_PtrList::RemoveAll() {
   m_nCount = 0;
   m_pNodeHead = m_pNodeTail = m_pNodeFree = NULL;
   m_pBlocks->FreeDataChain();
   m_pBlocks = NULL;
 }
 CFX_PtrList::CNode* CFX_PtrList::NewNode(CFX_PtrList::CNode* pPrev,
                                          CFX_PtrList::CNode* pNext) {
-  if (m_pNodeFree == NULL) {
+  if (!m_pNodeFree) {
     CFX_Plex* pNewBlock =
         CFX_Plex::Create(m_pBlocks, m_nBlockSize, sizeof(CNode));
     CNode* pNode = (CNode*)pNewBlock->data();
     pNode += m_nBlockSize - 1;
     for (int i = m_nBlockSize - 1; i >= 0; i--, pNode--) {
       pNode->pNext = m_pNodeFree;
       m_pNodeFree = pNode;
     }
   }
   ASSERT(m_pNodeFree);
@@ skipping 14 matching lines @@
   if (nIndex >= m_nCount || nIndex < 0) {
     return NULL;
   }
   CNode* pNode = m_pNodeHead;
   while (nIndex--) {
     pNode = pNode->pNext;
   }
   return (FX_POSITION)pNode;
 }
 FX_POSITION CFX_PtrList::Find(void* searchValue, FX_POSITION startAfter) const {
   CNode* pNode = (CNode*)startAfter;

[Tom Sepez, 2015/12/14 18:27:00]

nit: This calls for a ? operator here.

[Lei Zhang, 2015/12/15 01:58:36]

Done.

-  if (pNode == NULL) {
+  if (pNode) {
+    pNode = pNode->pNext;
+  } else {
     pNode = m_pNodeHead;
-  } else {
-    pNode = pNode->pNext;
   }
   for (; pNode; pNode = pNode->pNext) {
     if (pNode->data == searchValue) {
       return (FX_POSITION)pNode;
     }
   }
   return NULL;
 }