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

core/src/fpdfdoc/doc_utils.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"
 #include "doc_utils.h"
 
 static const int FPDFDOC_UTILS_MAXRECURSION = 32;
@@ skipping 224 matching lines @@
     FX_DWORD dwObjNum = pDocument->AddIndirectObject(pFormDict);
     CPDF_Dictionary* pRoot = pDocument->GetRoot();
     pRoot->SetAtReference("AcroForm", pDocument, dwObjNum);
   }
   CFX_ByteString csDA;
   if (!pFormDict->KeyExist("DR")) {
     CPDF_Font* pFont = NULL;
     CFX_ByteString csBaseName, csDefault;
     uint8_t charSet = CPDF_InterForm::GetNativeCharSet();
     pFont = CPDF_InterForm::AddStandardFont(pDocument, "Helvetica");
-    if (pFont != NULL) {
+    if (pFont) {
       AddInterFormFont(pFormDict, pDocument, pFont, csBaseName);
       csDefault = csBaseName;
     }
     if (charSet != 0) {
       CFX_ByteString csFontName = CPDF_InterForm::GetNativeFont(charSet, NULL);
       if (pFont == NULL || csFontName != "Helvetica") {
         pFont = CPDF_InterForm::AddNativeFont(pDocument);
-        if (pFont != NULL) {
+        if (pFont) {
           csBaseName = "";
           AddInterFormFont(pFormDict, pDocument, pFont, csBaseName);
           csDefault = csBaseName;
         }
       }
     }
-    if (pFont != NULL) {
+    if (pFont) {
       csDA = "/" + PDF_NameEncode(csDefault) + " 0 Tf";
     }
   }
   if (!csDA.IsEmpty()) {
     csDA += " ";
   }
   csDA += "0 g";
   if (!pFormDict->KeyExist("DA")) {
     pFormDict->SetAtString("DA", csDA);
   }
@@ skipping 174 matching lines @@
   }
   return NULL;
 }
 CPDF_Font* GetNativeInterFormFont(CPDF_Dictionary* pFormDict,
                                   CPDF_Document* pDocument,
                                   CFX_ByteString& csNameTag) {
   csNameTag = "";
   uint8_t charSet = CPDF_InterForm::GetNativeCharSet();
   CFX_SubstFont* pSubst;
   CPDF_Font* pFont = GetDefaultInterFormFont(pFormDict, pDocument);
-  if (pFont != NULL) {
+  if (pFont) {
     pSubst = (CFX_SubstFont*)pFont->GetSubstFont();
-    if (pSubst != NULL && pSubst->m_Charset == (int)charSet) {
+    if (pSubst && pSubst->m_Charset == (int)charSet) {
       FindInterFormFont(pFormDict, pFont, csNameTag);
       return pFont;
     }
   }
   return GetNativeInterFormFont(pFormDict, pDocument, charSet, csNameTag);
 }
 FX_BOOL FindInterFormFont(CPDF_Dictionary* pFormDict,
                           const CPDF_Font* pFont,
                           CFX_ByteString& csNameTag) {
   if (pFormDict == NULL || pFont == NULL) {
@@ skipping 117 matching lines @@
 CPDF_Font* AddNativeInterFormFont(CPDF_Dictionary*& pFormDict,
                                   CPDF_Document* pDocument,
                                   uint8_t charSet,
                                   CFX_ByteString& csNameTag) {
   if (pFormDict == NULL) {
     InitInterFormDict(pFormDict, pDocument);
   }
   CFX_ByteString csTemp;
   CPDF_Font* pFont =
       GetNativeInterFormFont(pFormDict, pDocument, charSet, csTemp);
-  if (pFont != NULL) {
+  if (pFont) {
     csNameTag = csTemp;
     return pFont;
   }
   CFX_ByteString csFontName = CPDF_InterForm::GetNativeFont(charSet);
   if (!csFontName.IsEmpty()) {
     if (FindInterFormFont(pFormDict, pDocument, csFontName, pFont, csNameTag)) {
       return pFont;
     }
   }
   pFont = CPDF_InterForm::AddNativeFont(charSet, pDocument);
-  if (pFont != NULL) {
+  if (pFont) {
     AddInterFormFont(pFormDict, pDocument, pFont, csNameTag);
   }
   return pFont;
 }
 CPDF_Font* AddNativeInterFormFont(CPDF_Dictionary*& pFormDict,
                                   CPDF_Document* pDocument,
                                   CFX_ByteString& csNameTag) {
   uint8_t charSet = CPDF_InterForm::GetNativeCharSet();
   return AddNativeInterFormFont(pFormDict, pDocument, charSet, csNameTag);
 }
@@ skipping 55 matching lines @@
     return TRUE;
   }
   return m_pDict->GetString("S", "P") != "A";
 }
 void CPDF_IconFit::GetIconPosition(FX_FLOAT& fLeft, FX_FLOAT& fBottom) {
   fLeft = fBottom = 0.5;
   if (m_pDict == NULL) {
     return;
   }
   CPDF_Array* pA = m_pDict->GetArray("A");
-  if (pA != NULL) {
+  if (pA) {
     FX_DWORD dwCount = pA->GetCount();
     if (dwCount > 0) {
       fLeft = pA->GetNumber(0);
     }
     if (dwCount > 1) {
       fBottom = pA->GetNumber(1);
     }
   }
 }
 FX_BOOL CPDF_IconFit::GetFittingBounds() {
@@ skipping 25 matching lines @@
   CPDF_Object* pAttr = pFieldDict->GetElementValue(name);
   if (pAttr) {
     return pAttr;
   }
   CPDF_Dictionary* pParent = pFieldDict->GetDict("Parent");
   if (pParent == NULL) {
     return NULL;
   }
   return FPDF_GetFieldAttr(pParent, name, nLevel + 1);
 }