Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(829)

Unified Diff: xfa/fxfa/app/xfa_checksum.cpp

Issue 1930533002: More IFX_ interface cleanup. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: xfa/fxfa/app/xfa_checksum.cpp
diff --git a/xfa/fxfa/app/xfa_checksum.cpp b/xfa/fxfa/app/xfa_checksum.cpp
index 56b0c88d638d2053e1409e140ae42f9b3365250d..481d8734f7e15359766a21c01bf2677c5c1c7da1 100644
--- a/xfa/fxfa/app/xfa_checksum.cpp
+++ b/xfa/fxfa/app/xfa_checksum.cpp
@@ -126,30 +126,29 @@ void CXFA_SAXReaderHandler::UpdateChecksum(FX_BOOL bCheckSpace) {
}
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) {
- return FALSE;
- }
- if (pSrcFile == NULL) {
+ if (!m_pSAXReader || !pSrcFile)
return FALSE;
- }
- if (size < 1) {
+ if (size < 1)
size = pSrcFile->GetSize();
- }
+
CXFA_SAXReaderHandler handler(this);
m_pSAXReader->SetHandler(&handler);
if (m_pSAXReader->StartParse(
@@ -161,6 +160,7 @@ FX_BOOL CXFA_ChecksumContext::UpdateChecksum(IFX_FileRead* pSrcFile,
}
return m_pSAXReader->ContinueParse(NULL) > 99;
}
+
void CXFA_ChecksumContext::FinishChecksum() {
if (m_pSAXReader) {
m_pSAXReader->Release();

Powered by Google App Engine
This is Rietveld 408576698