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

core/src/fpdfdoc/doc_basic.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/fpdfdoc/fpdf_doc.h"
 
 const int nMaxRecursion = 32;
 int CPDF_Dest::GetPageIndex(CPDF_Document* pDoc) {
@@ skipping 59 matching lines @@
 }
 static CPDF_Object* SearchNameNode(CPDF_Dictionary* pNode,
                                    const CFX_ByteString& csName,
                                    int& nIndex,
                                    CPDF_Array** ppFind,
                                    int nLevel = 0) {
   if (nLevel > nMaxRecursion) {
     return NULL;
   }
   CPDF_Array* pLimits = pNode->GetArray("Limits");
-  if (pLimits != NULL) {
+  if (pLimits) {
     CFX_ByteString csLeft = pLimits->GetString(0);
     CFX_ByteString csRight = pLimits->GetString(1);
     if (csLeft.Compare(csRight) > 0) {
       CFX_ByteString csTmp = csRight;
       csRight = csLeft;
       csLeft = csTmp;
     }
     if (csName.Compare(csLeft) < 0 || csName.Compare(csRight) > 0) {
       return NULL;
     }
   }
   CPDF_Array* pNames = pNode->GetArray("Names");
   if (pNames) {
     FX_DWORD dwCount = pNames->GetCount() / 2;
     for (FX_DWORD i = 0; i < dwCount; i++) {
       CFX_ByteString csValue = pNames->GetString(i * 2);
       int32_t iCompare = csValue.Compare(csName);
       if (iCompare <= 0) {
-        if (ppFind != NULL) {
+        if (ppFind) {
           *ppFind = pNames;
         }
         if (iCompare < 0) {
           continue;
         }
       } else {
         break;
       }
       nIndex += i;
       return pNames->GetElementValue(i * 2 + 1);
@@ skipping 27 matching lines @@
   if (nLevel > nMaxRecursion) {
     return NULL;
   }
   CPDF_Array* pNames = pNode->GetArray("Names");
   if (pNames) {
     int nCount = pNames->GetCount() / 2;
     if (nIndex >= nCurIndex + nCount) {
       nCurIndex += nCount;
       return NULL;
     }
-    if (ppFind != NULL) {
+    if (ppFind) {
       *ppFind = pNames;
     }
     csName = pNames->GetString((nIndex - nCurIndex) * 2);
     return pNames->GetElementValue((nIndex - nCurIndex) * 2 + 1);
   }
   CPDF_Array* pKids = pNode->GetArray("Kids");
   if (pKids == NULL) {
     return NULL;
   }
   for (FX_DWORD i = 0; i < pKids->GetCount(); i++) {
@@ skipping 224 matching lines @@
     return nullptr;
   if (CPDF_Stream* pStream = m_pObj->AsStream())
     return pStream;
   if (CPDF_Dictionary* pEF = m_pObj->AsDictionary()->GetDict("EF"))
     return pEF->GetStream("F");
   return nullptr;
 }
 static void FPDFDOC_FILESPEC_SetFileName(CPDF_Object* pObj,
                                          const CFX_WideStringC& wsFileName,
                                          FX_BOOL bURL) {
-  ASSERT(pObj != NULL);
+  ASSERT(pObj);

[Tom Sepez, 2015/12/14 19:14:11]

nit: will segv at line 399.

[Lei Zhang, 2015/12/15 01:38:32]

Done.

   CFX_WideString wsStr;
   if (bURL) {
     wsStr = wsFileName;
   } else {
     wsStr = FILESPEC_EncodeFileName(wsFileName);
   }
   if (pObj->IsString()) {
     pObj->SetString(CFX_ByteString::FromUnicode(wsStr));
   } else if (CPDF_Dictionary* pDict = pObj->AsDictionary()) {
     pDict->SetAtString("F", CFX_ByteString::FromUnicode(wsStr));
     pDict->SetAtString("UF", PDF_EncodeText(wsStr));
   }
 }
 void CPDF_FileSpec::SetFileName(const CFX_WideStringC& wsFileName,
                                 FX_BOOL bURL) {
-  ASSERT(m_pObj != NULL);
+  ASSERT(m_pObj);

[Tom Sepez, 2015/12/14 19:14:09]

nitto

[Lei Zhang, 2015/12/15 01:38:32]

Done.

   if (bURL) {
     if (CPDF_Dictionary* pDict = m_pObj->AsDictionary()) {
       pDict->SetAtName("FS", "URL");
     }
   }
   FPDFDOC_FILESPEC_SetFileName(m_pObj, wsFileName, bURL);
 }
 static CFX_WideString _MakeRoman(int num) {
   const int arabic[] = {1000, 900, 500, 400, 100, 90, 50, 40, 10, 9, 5, 4, 1};
   const CFX_WideString roman[] = {L"m",  L"cm", L"d",  L"cd", L"c",
@@ skipping 57 matching lines @@
   CPDF_Dictionary* pPDFRoot = m_pDocument->GetRoot();
   if (pPDFRoot == NULL) {
     return wsLabel;
   }
   CPDF_Dictionary* pLabels = pPDFRoot->GetDict("PageLabels");
   CPDF_NumberTree numberTree(pLabels);
   CPDF_Object* pValue = NULL;
   int n = nPage;
   while (n >= 0) {
     pValue = numberTree.LookupValue(n);
-    if (pValue != NULL) {
+    if (pValue) {
       break;
     }
     n--;
   }
-  if (pValue != NULL) {
+  if (pValue) {
     pValue = pValue->GetDirect();
     if (CPDF_Dictionary* pLabel = pValue->AsDictionary()) {
       if (pLabel->KeyExist("P")) {
         wsLabel += pLabel->GetUnicodeText("P");
       }
       CFX_ByteString bsNumberingStyle = pLabel->GetString("S", NULL);
       int nLabelNum = nPage - n + pLabel->GetInteger("St", 1);
       CFX_WideString wsNumPortion =
           _GetLabelNumPortion(nLabelNum, bsNumberingStyle);
       wsLabel += wsNumPortion;
@@ skipping 24 matching lines @@
   int nPage = FXSYS_atoi(bsLbl);
   if (nPage > 0 && nPage <= nPages) {
     return nPage;
   }
   return -1;
 }
 int32_t CPDF_PageLabel::GetPageByLabel(const CFX_WideStringC& wsLabel) const {
   CFX_ByteString bsLabel = PDF_EncodeText(wsLabel.GetPtr());
   return GetPageByLabel(bsLabel);
 }