Index: core/src/fxcrt/xml_int.h |
diff --git a/core/src/fxcrt/xml_int.h b/core/src/fxcrt/xml_int.h |
index 109c7a43d2e5f3432621d4aba9b68c3ef05c666e..1008436c8452542fa34a13782f8d79fff75fb5b8 100644 |
--- a/core/src/fxcrt/xml_int.h |
+++ b/core/src/fxcrt/xml_int.h |
@@ -9,157 +9,112 @@ |
#include "../../include/fxcrt/fx_stream.h" |
-class CXML_DataBufAcc : public IFX_BufferRead |
-{ |
-public: |
- CXML_DataBufAcc(const uint8_t* pBuffer, size_t size) |
- : m_pBuffer(pBuffer) |
- , m_dwSize(size) |
- , m_dwCurPos(0) |
- { |
- } |
- virtual ~CXML_DataBufAcc() {} |
- virtual void Release() |
- { |
- delete this; |
- } |
- virtual FX_BOOL IsEOF() |
- { |
- return m_dwCurPos >= m_dwSize; |
- } |
- virtual FX_FILESIZE GetPosition() |
- { |
- return (FX_FILESIZE)m_dwCurPos; |
- } |
- virtual size_t ReadBlock(void* buffer, size_t size) |
- { |
- return 0; |
- } |
- virtual FX_BOOL ReadNextBlock(FX_BOOL bRestart = FALSE) |
- { |
- if (bRestart) { |
- m_dwCurPos = 0; |
- } |
- if (m_dwCurPos < m_dwSize) { |
- m_dwCurPos = m_dwSize; |
- return TRUE; |
- } |
- return FALSE; |
- } |
- virtual const uint8_t* GetBlockBuffer() |
- { |
- return m_pBuffer; |
- } |
- virtual size_t GetBlockSize() |
- { |
- return m_dwSize; |
- } |
- virtual FX_FILESIZE GetBlockOffset() |
- { |
- return 0; |
- } |
-protected: |
- const uint8_t* m_pBuffer; |
- size_t m_dwSize; |
- size_t m_dwCurPos; |
+class CXML_DataBufAcc : public IFX_BufferRead { |
+ public: |
+ CXML_DataBufAcc(const uint8_t* pBuffer, size_t size) |
+ : m_pBuffer(pBuffer), m_dwSize(size), m_dwCurPos(0) {} |
+ virtual ~CXML_DataBufAcc() {} |
+ virtual void Release() { delete this; } |
+ virtual FX_BOOL IsEOF() { return m_dwCurPos >= m_dwSize; } |
+ virtual FX_FILESIZE GetPosition() { return (FX_FILESIZE)m_dwCurPos; } |
+ virtual size_t ReadBlock(void* buffer, size_t size) { return 0; } |
+ virtual FX_BOOL ReadNextBlock(FX_BOOL bRestart = FALSE) { |
+ if (bRestart) { |
+ m_dwCurPos = 0; |
+ } |
+ if (m_dwCurPos < m_dwSize) { |
+ m_dwCurPos = m_dwSize; |
+ return TRUE; |
+ } |
+ return FALSE; |
+ } |
+ virtual const uint8_t* GetBlockBuffer() { return m_pBuffer; } |
+ virtual size_t GetBlockSize() { return m_dwSize; } |
+ virtual FX_FILESIZE GetBlockOffset() { return 0; } |
+ |
+ protected: |
+ const uint8_t* m_pBuffer; |
+ size_t m_dwSize; |
+ size_t m_dwCurPos; |
}; |
-#define FX_XMLDATASTREAM_BufferSize (32 * 1024) |
-class CXML_DataStmAcc : public IFX_BufferRead |
-{ |
-public: |
- CXML_DataStmAcc(IFX_FileRead *pFileRead) |
- : m_pFileRead(pFileRead) |
- , m_pBuffer(NULL) |
- , m_nStart(0) |
- , m_dwSize(0) |
- { |
- FXSYS_assert(m_pFileRead != NULL); |
- } |
- virtual ~CXML_DataStmAcc() |
- { |
- if (m_pBuffer) { |
- FX_Free(m_pBuffer); |
- } |
- } |
- virtual void Release() |
- { |
- delete this; |
- } |
- virtual FX_BOOL IsEOF() |
- { |
- return m_nStart + (FX_FILESIZE)m_dwSize >= m_pFileRead->GetSize(); |
- } |
- virtual FX_FILESIZE GetPosition() |
- { |
- return m_nStart + (FX_FILESIZE)m_dwSize; |
- } |
- virtual size_t ReadBlock(void* buffer, size_t size) |
- { |
- return 0; |
- } |
- virtual FX_BOOL ReadNextBlock(FX_BOOL bRestart = FALSE) |
- { |
- if (bRestart) { |
- m_nStart = 0; |
- } |
- FX_FILESIZE nLength = m_pFileRead->GetSize(); |
- m_nStart += (FX_FILESIZE)m_dwSize; |
- if (m_nStart >= nLength) { |
- return FALSE; |
- } |
- m_dwSize = (size_t)FX_MIN(FX_XMLDATASTREAM_BufferSize, nLength - m_nStart); |
- if (!m_pBuffer) { |
- m_pBuffer = FX_Alloc(uint8_t, m_dwSize); |
- } |
- return m_pFileRead->ReadBlock(m_pBuffer, m_nStart, m_dwSize); |
- } |
- virtual const uint8_t* GetBlockBuffer() |
- { |
- return (const uint8_t*)m_pBuffer; |
- } |
- virtual size_t GetBlockSize() |
- { |
- return m_dwSize; |
- } |
- virtual FX_FILESIZE GetBlockOffset() |
- { |
- return m_nStart; |
- } |
-protected: |
- IFX_FileRead *m_pFileRead; |
- uint8_t* m_pBuffer; |
- FX_FILESIZE m_nStart; |
- size_t m_dwSize; |
+#define FX_XMLDATASTREAM_BufferSize (32 * 1024) |
+class CXML_DataStmAcc : public IFX_BufferRead { |
+ public: |
+ CXML_DataStmAcc(IFX_FileRead* pFileRead) |
+ : m_pFileRead(pFileRead), m_pBuffer(NULL), m_nStart(0), m_dwSize(0) { |
+ FXSYS_assert(m_pFileRead != NULL); |
+ } |
+ virtual ~CXML_DataStmAcc() { |
+ if (m_pBuffer) { |
+ FX_Free(m_pBuffer); |
+ } |
+ } |
+ virtual void Release() { delete this; } |
+ virtual FX_BOOL IsEOF() { |
+ return m_nStart + (FX_FILESIZE)m_dwSize >= m_pFileRead->GetSize(); |
+ } |
+ virtual FX_FILESIZE GetPosition() { return m_nStart + (FX_FILESIZE)m_dwSize; } |
+ virtual size_t ReadBlock(void* buffer, size_t size) { return 0; } |
+ virtual FX_BOOL ReadNextBlock(FX_BOOL bRestart = FALSE) { |
+ if (bRestart) { |
+ m_nStart = 0; |
+ } |
+ FX_FILESIZE nLength = m_pFileRead->GetSize(); |
+ m_nStart += (FX_FILESIZE)m_dwSize; |
+ if (m_nStart >= nLength) { |
+ return FALSE; |
+ } |
+ m_dwSize = (size_t)FX_MIN(FX_XMLDATASTREAM_BufferSize, nLength - m_nStart); |
+ if (!m_pBuffer) { |
+ m_pBuffer = FX_Alloc(uint8_t, m_dwSize); |
+ } |
+ return m_pFileRead->ReadBlock(m_pBuffer, m_nStart, m_dwSize); |
+ } |
+ virtual const uint8_t* GetBlockBuffer() { return (const uint8_t*)m_pBuffer; } |
+ virtual size_t GetBlockSize() { return m_dwSize; } |
+ virtual FX_FILESIZE GetBlockOffset() { return m_nStart; } |
+ |
+ protected: |
+ IFX_FileRead* m_pFileRead; |
+ uint8_t* m_pBuffer; |
+ FX_FILESIZE m_nStart; |
+ size_t m_dwSize; |
}; |
-class CXML_Parser |
-{ |
-public: |
- ~CXML_Parser(); |
- IFX_BufferRead* m_pDataAcc; |
- FX_BOOL m_bOwnedStream; |
- FX_FILESIZE m_nOffset; |
- FX_BOOL m_bSaveSpaceChars; |
- const uint8_t* m_pBuffer; |
- size_t m_dwBufferSize; |
- FX_FILESIZE m_nBufferOffset; |
- size_t m_dwIndex; |
- FX_BOOL Init(uint8_t* pBuffer, size_t size); |
- FX_BOOL Init(IFX_FileRead *pFileRead); |
- FX_BOOL Init(IFX_BufferRead *pBuffer); |
- FX_BOOL Init(FX_BOOL bOwndedStream); |
- FX_BOOL ReadNextBlock(); |
- FX_BOOL IsEOF(); |
- FX_BOOL HaveAvailData(); |
- void SkipWhiteSpaces(); |
- void GetName(CFX_ByteString& space, CFX_ByteString& name); |
- void GetAttrValue(CFX_WideString &value); |
- FX_DWORD GetCharRef(); |
- void GetTagName(CFX_ByteString &space, CFX_ByteString &name, FX_BOOL &bEndTag, FX_BOOL bStartTag = FALSE); |
- void SkipLiterals(const CFX_ByteStringC& str); |
- CXML_Element* ParseElement(CXML_Element* pParent, FX_BOOL bStartTag = FALSE); |
- void InsertContentSegment(FX_BOOL bCDATA, const CFX_WideStringC& content, CXML_Element* pElement); |
- void InsertCDATASegment(CFX_UTF8Decoder& decoder, CXML_Element* pElement); |
+class CXML_Parser { |
+ public: |
+ ~CXML_Parser(); |
+ IFX_BufferRead* m_pDataAcc; |
+ FX_BOOL m_bOwnedStream; |
+ FX_FILESIZE m_nOffset; |
+ FX_BOOL m_bSaveSpaceChars; |
+ const uint8_t* m_pBuffer; |
+ size_t m_dwBufferSize; |
+ FX_FILESIZE m_nBufferOffset; |
+ size_t m_dwIndex; |
+ FX_BOOL Init(uint8_t* pBuffer, size_t size); |
+ FX_BOOL Init(IFX_FileRead* pFileRead); |
+ FX_BOOL Init(IFX_BufferRead* pBuffer); |
+ FX_BOOL Init(FX_BOOL bOwndedStream); |
+ FX_BOOL ReadNextBlock(); |
+ FX_BOOL IsEOF(); |
+ FX_BOOL HaveAvailData(); |
+ void SkipWhiteSpaces(); |
+ void GetName(CFX_ByteString& space, CFX_ByteString& name); |
+ void GetAttrValue(CFX_WideString& value); |
+ FX_DWORD GetCharRef(); |
+ void GetTagName(CFX_ByteString& space, |
+ CFX_ByteString& name, |
+ FX_BOOL& bEndTag, |
+ FX_BOOL bStartTag = FALSE); |
+ void SkipLiterals(const CFX_ByteStringC& str); |
+ CXML_Element* ParseElement(CXML_Element* pParent, FX_BOOL bStartTag = FALSE); |
+ void InsertContentSegment(FX_BOOL bCDATA, |
+ const CFX_WideStringC& content, |
+ CXML_Element* pElement); |
+ void InsertCDATASegment(CFX_UTF8Decoder& decoder, CXML_Element* pElement); |
}; |
-void FX_XML_SplitQualifiedName(const CFX_ByteStringC& bsFullName, CFX_ByteStringC &bsSpace, CFX_ByteStringC &bsName); |
+void FX_XML_SplitQualifiedName(const CFX_ByteStringC& bsFullName, |
+ CFX_ByteStringC& bsSpace, |
+ CFX_ByteStringC& bsName); |
#endif // CORE_SRC_FXCRT_XML_INT_H_ |