From b8a074711108baf04017d86207e08c19ff327d8e Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 2 Oct 2015 11:26:58 -0700 Subject: Get rid of gotos in CPDF_SyntaxParser and FlateUncompress(). R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1360103002 . --- core/include/fpdfapi/fpdf_parser.h | 10 ++++++---- core/include/fxcrt/fx_basic.h | 10 ++++------ 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'core/include') diff --git a/core/include/fpdfapi/fpdf_parser.h b/core/include/fpdfapi/fpdf_parser.h index 6194247568..04c7d90f6f 100644 --- a/core/include/fpdfapi/fpdf_parser.h +++ b/core/include/fpdfapi/fpdf_parser.h @@ -453,10 +453,10 @@ class CPDF_Parser { FX_BOOL LoadAllCrossRefV5(FX_FILESIZE pos); - FX_BOOL LoadCrossRefV4(FX_FILESIZE pos, - FX_FILESIZE streampos, - FX_BOOL bSkip, - FX_BOOL bFirst); + bool LoadCrossRefV4(FX_FILESIZE pos, + FX_FILESIZE streampos, + FX_BOOL bSkip, + FX_BOOL bFirst); FX_BOOL LoadCrossRefV5(FX_FILESIZE pos, FX_FILESIZE& prev, FX_BOOL bMainXRef); @@ -482,6 +482,8 @@ class CPDF_Parser { FX_BOOL IsLinearizedFile(IFX_FileRead* pFileAccess, FX_DWORD offset); + bool FindPosInOffsets(FX_FILESIZE pos) const; + int m_FileVersion; CPDF_Dictionary* m_pTrailer; diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h index 7412b8db3c..9ed5fbafcf 100644 --- a/core/include/fxcrt/fx_basic.h +++ b/core/include/fxcrt/fx_basic.h @@ -936,15 +936,13 @@ class IFX_Pause { template class CFX_AutoRestorer { public: - explicit CFX_AutoRestorer(T* location) { - m_Location = location; - m_OldValue = *location; - } + explicit CFX_AutoRestorer(T* location) + : m_Location(location), m_OldValue(*location) {} ~CFX_AutoRestorer() { *m_Location = m_OldValue; } private: - T* m_Location; - T m_OldValue; + T* const m_Location; + const T m_OldValue; }; struct FxFreeDeleter { -- cgit v1.2.3