More IFX_ interface cleanup.

xfa/fxfa/app/xfa_checksum.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 "xfa/fxfa/include/xfa_checksum.h"
 
 #include "core/fdrm/crypto/include/fx_crypt.h"
 #include "xfa/fgas/crt/fgas_algorithm.h"
@@ skipping 108 matching lines @@
       }
     }
   }
   if (bUpdata) {
     m_pContext->Update(CFX_ByteStringC(pBuffer, iLength));
   }
   m_SAXContext.m_TextBuf.Clear();
 }
 
 CXFA_ChecksumContext::CXFA_ChecksumContext()
-    : m_pSAXReader(NULL), m_pByteContext(NULL) {}
+    : m_pSAXReader(nullptr), m_pByteContext(nullptr) {}
+
 CXFA_ChecksumContext::~CXFA_ChecksumContext() {
   FinishChecksum();
 }
+
 FX_BOOL CXFA_ChecksumContext::StartChecksum() {
   FinishChecksum();
   m_pByteContext = FX_Alloc(uint8_t, 128);
   CRYPT_SHA1Start(m_pByteContext);
   m_bsChecksum.clear();
-  m_pSAXReader = FX_SAXReader_Create();
-  return m_pSAXReader != NULL;
+  m_pSAXReader = new CFX_SAXReader;
+  return TRUE;

[Lei Zhang, 2016/04/27 19:23:50]

Always returns true -> return void?

[dsinclair, 2016/04/27 19:31:32]

Done.

 }
+
 FX_BOOL CXFA_ChecksumContext::UpdateChecksum(IFX_FileRead* pSrcFile,
                                              FX_FILESIZE offset,
                                              size_t size) {
-  if (m_pSAXReader == NULL) {
+  if (!m_pSAXReader || !pSrcFile)
     return FALSE;
-  }
-  if (pSrcFile == NULL) {
-    return FALSE;
-  }
-  if (size < 1) {
+  if (size < 1)
     size = pSrcFile->GetSize();
-  }
+
   CXFA_SAXReaderHandler handler(this);
   m_pSAXReader->SetHandler(&handler);
   if (m_pSAXReader->StartParse(
           pSrcFile, (uint32_t)offset, (uint32_t)size,
           FX_SAXPARSEMODE_NotSkipSpace | FX_SAXPARSEMODE_NotConvert_amp |
               FX_SAXPARSEMODE_NotConvert_lt | FX_SAXPARSEMODE_NotConvert_gt |
               FX_SAXPARSEMODE_NotConvert_sharp) < 0) {
     return FALSE;
   }
   return m_pSAXReader->ContinueParse(NULL) > 99;
 }
+
 void CXFA_ChecksumContext::FinishChecksum() {
   if (m_pSAXReader) {
     m_pSAXReader->Release();
     m_pSAXReader = NULL;
   }
   if (m_pByteContext) {
     uint8_t digest[20];
     FXSYS_memset(digest, 0, 20);
     CRYPT_SHA1Finish(m_pByteContext, digest);
     int32_t nLen = FX_Base64EncodeA(digest, 20, NULL);
     FX_CHAR* pBuffer = m_bsChecksum.GetBuffer(nLen);
     FX_Base64EncodeA(digest, 20, pBuffer);
     m_bsChecksum.ReleaseBuffer(nLen);
     FX_Free(m_pByteContext);
     m_pByteContext = NULL;
   }
 }
 void CXFA_ChecksumContext::GetChecksum(CFX_ByteString& bsChecksum) {
   bsChecksum = m_bsChecksum;
 }
 void CXFA_ChecksumContext::Update(const CFX_ByteStringC& bsText) {
   if (m_pByteContext) {
     CRYPT_SHA1Update(m_pByteContext, bsText.raw_str(), bsText.GetLength());
   }
 }