From 04c1009af887eb5d3a183dd26421f644f63d8b77 Mon Sep 17 00:00:00 2001 From: tsepez Date: Tue, 25 Oct 2016 15:16:40 -0700 Subject: 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 | 4 ++-- xfa/fxfa/parser/cxfa_simple_parser.cpp | 2 +- xfa/fxfa/parser/xfa_document_datamerger_imp.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp index 13b79baf9b..2a2bb3c48d 100644 --- a/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp +++ b/fpdfsdk/fpdfxfa/cpdfxfa_docenvironment.cpp @@ -709,16 +709,16 @@ IFX_SeekableReadStream* CPDFXFA_DocEnvironment::OpenLinkedFile( 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); } diff --git a/xfa/fxfa/parser/cxfa_simple_parser.cpp b/xfa/fxfa/parser/cxfa_simple_parser.cpp index f40060bca2..997094351e 100644 --- a/xfa/fxfa/parser/cxfa_simple_parser.cpp +++ b/xfa/fxfa/parser/cxfa_simple_parser.cpp @@ -37,7 +37,7 @@ CFDE_XMLNode* GetDocumentNode(CFDE_XMLDoc* pXMLDoc, pNextNode; pNextNode = pNextNode->GetNodeItem(CFDE_XMLNode::NextSibling)) { if (pNextNode->GetType() == FDE_XMLNODE_Element) - return FALSE; + return nullptr; } return pXMLNode; } diff --git a/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp b/xfa/fxfa/parser/xfa_document_datamerger_imp.cpp index 8d50a5a96d..a0ff81405d 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* FormValueNode_CreateChild(CXFA_Node* pValueNode, XFA_Element iType) { 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; -- cgit v1.2.3