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)
     : m_pNodeHead(NULL),
       m_pNodeTail(NULL),
       m_nCount(0),
       m_pNodeFree(NULL),
       m_pBlocks(NULL),
       m_nBlockSize(nBlockSize) {}
 FX_POSITION CFX_PtrList::AddTail(void* newElement) {
   CNode* pNewNode = NewNode(m_pNodeTail, NULL);
   pNewNode->data = newElement;
-  if (m_pNodeTail != NULL) {
+  if (m_pNodeTail) {
     m_pNodeTail->pNext = pNewNode;
   } else {
     m_pNodeHead = pNewNode;
   }
   m_pNodeTail = pNewNode;
   return (FX_POSITION)pNewNode;
 }
 FX_POSITION CFX_PtrList::AddHead(void* newElement) {
   CNode* pNewNode = NewNode(NULL, m_pNodeHead);
   pNewNode->data = newElement;
-  if (m_pNodeHead != NULL) {
+  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) {
     return AddTail(newElement);
   }
   CNode* pOldNode = (CNode*)position;
   CNode* pNewNode = NewNode(pOldNode, pOldNode->pNext);
   pNewNode->data = newElement;
-  if (pOldNode->pNext != NULL) {
+  if (pOldNode->pNext) {
     pOldNode->pNext->pPrev = pNewNode;
   } else {
     m_pNodeTail = pNewNode;
   }
   pOldNode->pNext = pNewNode;
   return (FX_POSITION)pNewNode;
 }
 void CFX_PtrList::RemoveAt(FX_POSITION position) {
   CNode* pOldNode = (CNode*)position;
   if (pOldNode == m_pNodeHead) {
@@ skipping 27 matching lines @@
   if (m_pNodeFree == NULL) {
     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 != NULL);
   CFX_PtrList::CNode* pNode = m_pNodeFree;
   m_pNodeFree = m_pNodeFree->pNext;
   pNode->pPrev = pPrev;
   pNode->pNext = pNext;
   m_nCount++;
   ASSERT(m_nCount > 0);
   pNode->data = 0;
   return pNode;
 }
 CFX_PtrList::~CFX_PtrList() {
@@ skipping 10 matching lines @@
   }
   return (FX_POSITION)pNode;
 }
 FX_POSITION CFX_PtrList::Find(void* searchValue, FX_POSITION startAfter) const {
   CNode* pNode = (CNode*)startAfter;
   if (pNode == NULL) {
     pNode = m_pNodeHead;
   } else {
     pNode = pNode->pNext;
   }
-  for (; pNode != NULL; pNode = pNode->pNext)
-    if (pNode->data == searchValue) {
+  for (; pNode; pNode = pNode->pNext) {
+    if (pNode->data == searchValue)
       return (FX_POSITION)pNode;
-    }
+  }
   return NULL;
 }