commit 04c1009af887eb5d3a183dd26421f644f63d8b77
author tsepez <tsepez@chromium.org> Tue Oct 25 15:16:40 2016 -0700
committer Commit bot <commit-bot@chromium.org> Tue Oct 25 15:16:40 2016 -0700
tree e0400b66f317c60447f127dcc17307f3c27c513c
parent 530c7acf7aa11ff8db8743af0d62b39cf36bf539

Fix some return FALSE in functions that return pointers

This previously compiled because FALSE is #defined to 0, and 0
is a perfectly fine value for a pointer.

Review-Url: https://codereview.chromium.org/2448943003

fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp

diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp
index 13b79ba..2a2bb3c 100644
--- a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp
+++ b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp
@@ -709,16 +709,16 @@
     const CFX_WideString& wsLink) {
   CPDFSDK_FormFillEnvironment* pFormFillEnv = m_pDocument->GetFormFillEnv();
   if (!pFormFillEnv)
-    return FALSE;
+    return nullptr;
 
   CFX_ByteString bs = wsLink.UTF16LE_Encode();
   int len = bs.GetLength();
   FPDF_FILEHANDLER* pFileHandler =
       pFormFillEnv->OpenFile(0, (FPDF_WIDESTRING)bs.GetBuffer(len), "rb");
   bs.ReleaseBuffer(len);
-
   if (!pFileHandler)
     return nullptr;
+
   return new CFPDF_FileStream(pFileHandler);
 }
 

xfa/fxfa/parser/cxfa_simple_parser.cpp

diff --git a/xfa/fxfa/parser/cxfa_simple_parser.cpp b/xfa/fxfa/parser/cxfa_simple_parser.cpp
index f40060b..9970943 100644
--- a/xfa/fxfa/parser/cxfa_simple_parser.cpp
+++ b/xfa/fxfa/parser/cxfa_simple_parser.cpp
@@ -37,7 +37,7 @@
          pNextNode;
          pNextNode = pNextNode->GetNodeItem(CFDE_XMLNode::NextSibling)) {
       if (pNextNode->GetType() == FDE_XMLNODE_Element)
-        return FALSE;
+        return nullptr;
     }
     return pXMLNode;
   }

xfa/fxfa/parser/xfa_document_datamerger_imp.cpp

diff --git a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
index 8d50a5a..a0ff814 100644
--- a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
+++ b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp
@@ -52,7 +52,7 @@
   CXFA_Node* pChildNode = pValueNode->GetNodeItem(XFA_NODEITEM_FirstChild);
   if (!pChildNode) {
     if (iType == XFA_Element::Unknown)
-      return FALSE;
+      return nullptr;
     pChildNode = pValueNode->GetProperty(0, iType);
   }
   return pChildNode;