diff options
Diffstat (limited to 'xfa/src/fgas/src/xml')
| -rw-r--r-- | xfa/src/fgas/src/xml/fx_sax_imp.cpp | 10 | ||||
| -rw-r--r-- | xfa/src/fgas/src/xml/fx_sax_imp.h | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/xfa/src/fgas/src/xml/fx_sax_imp.cpp b/xfa/src/fgas/src/xml/fx_sax_imp.cpp index fedf89f9f9..0e47ce53d4 100644 --- a/xfa/src/fgas/src/xml/fx_sax_imp.cpp +++ b/xfa/src/fgas/src/xml/fx_sax_imp.cpp @@ -102,8 +102,8 @@ CFX_SAXReader::CFX_SAXReader() , m_pCommentContext(NULL)
, m_dwParseMode(0)
{
- m_pszData = (FX_LPBYTE)FX_Alloc(uint8_t, m_iDataSize);
- m_pszName = (FX_LPBYTE)FX_Alloc(uint8_t, m_iNameSize);
+ m_pszData = (uint8_t*)FX_Alloc(uint8_t, m_iDataSize);
+ m_pszName = (uint8_t*)FX_Alloc(uint8_t, m_iNameSize);
}
CFX_SAXReader::~CFX_SAXReader()
{
@@ -179,7 +179,7 @@ void CFX_SAXReader::ReallocDataBuffer() } else {
m_iDataSize += 1024 * 1024;
}
- m_pszData = (FX_LPBYTE)FX_Realloc(uint8_t, m_pszData, m_iDataSize);
+ m_pszData = (uint8_t*)FX_Realloc(uint8_t, m_pszData, m_iDataSize);
}
void CFX_SAXReader::ReallocNameBuffer()
{
@@ -191,7 +191,7 @@ void CFX_SAXReader::ReallocNameBuffer() } else {
m_iNameSize += 1024 * 1024;
}
- m_pszName = (FX_LPBYTE)FX_Realloc(uint8_t, m_pszName, m_iNameSize);
+ m_pszName = (uint8_t*)FX_Realloc(uint8_t, m_pszName, m_iNameSize);
}
inline FX_BOOL CFX_SAXReader::SkipSpace(uint8_t ch)
{
@@ -239,7 +239,7 @@ int32_t CFX_SAXReader::ContinueParse(IFX_Pause *pPause ) while(m_File.m_dwCur < m_File.m_dwEnd) {
FX_DWORD &index = m_File.m_dwBufIndex;
FX_DWORD size = m_File.m_dwBufSize;
- FX_LPCBYTE pBuf = m_File.m_pBuf;
+ const uint8_t* pBuf = m_File.m_pBuf;
while (index < size) {
m_CurByte = pBuf[index];
(this->*g_FX_SAXReader_LPFParse[m_eMode])();
diff --git a/xfa/src/fgas/src/xml/fx_sax_imp.h b/xfa/src/fgas/src/xml/fx_sax_imp.h index a2f7259235..6e95c81fae 100644 --- a/xfa/src/fgas/src/xml/fx_sax_imp.h +++ b/xfa/src/fgas/src/xml/fx_sax_imp.h @@ -18,7 +18,7 @@ public: FX_DWORD m_dwStart;
FX_DWORD m_dwEnd;
FX_DWORD m_dwCur;
- FX_LPBYTE m_pBuf;
+ uint8_t* m_pBuf;
FX_DWORD m_dwBufSize;
FX_DWORD m_dwBufIndex;
};
@@ -49,7 +49,7 @@ public: , m_pPrev(NULL)
, m_pNext(NULL)
{}
- FX_LPVOID m_pNode;
+ void* m_pNode;
FX_SAXNODE m_eNode;
FX_DWORD m_dwID;
FX_BOOL m_bSkip;
@@ -111,12 +111,12 @@ protected: CFX_ByteArray m_SkipStack;
uint8_t m_SkipChar;
FX_DWORD m_dwNodePos;
- FX_LPBYTE m_pszData;
+ uint8_t* m_pszData;
int32_t m_iDataSize;
int32_t m_iDataLength;
int32_t m_iEntityStart;
int32_t m_iDataPos;
- FX_LPBYTE m_pszName;
+ uint8_t* m_pszName;
int32_t m_iNameSize;
int32_t m_iNameLength;
FX_DWORD m_dwParseMode;
|