Remove typdefs for pointer types in fx_system.h

core/src/fxcrt/fx_basic_buffer.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 "../../include/fxcrt/fx_basic.h"
-FX_STRSIZE FX_ftoa(FX_FLOAT f, FX_LPSTR buf);
+FX_STRSIZE FX_ftoa(FX_FLOAT f, FX_CHAR* buf);
 CFX_BinaryBuf::CFX_BinaryBuf()
     : m_AllocStep(0)
     , m_pBuffer(NULL)
     , m_DataSize(0)
     , m_AllocSize(0)
 {
 }
 CFX_BinaryBuf::CFX_BinaryBuf(FX_STRSIZE size)
     : m_AllocStep(0)
     , m_DataSize(size)
@@ skipping 24 matching lines @@
     m_DataSize = 0;
     m_pBuffer = NULL;
     m_AllocSize = 0;
 }
 void CFX_BinaryBuf::AttachData(void* buffer, FX_STRSIZE size)
 {
     if (m_pBuffer) {
         FX_Free(m_pBuffer);
     }
     m_DataSize = size;
-    m_pBuffer = (FX_LPBYTE)buffer;
+    m_pBuffer = (uint8_t*)buffer;
     m_AllocSize = size;
 }
 void CFX_BinaryBuf::TakeOver(CFX_BinaryBuf& other)
 {
     AttachData(other.GetBuffer(), other.GetSize());
     other.DetachBuffer();
 }
 void CFX_BinaryBuf::EstimateSize(FX_STRSIZE size, FX_STRSIZE step)
 {
     m_AllocStep = step;
@@ skipping 11 matching lines @@
     int alloc_step;
     if (m_AllocStep == 0) {
         alloc_step = m_AllocSize / 4;
         if (alloc_step < 128 ) {
             alloc_step = 128;
         }
     } else {
         alloc_step = m_AllocStep;
     }
     new_size = (new_size + alloc_step - 1) / alloc_step * alloc_step;
-    FX_LPBYTE pNewBuffer = m_pBuffer;
+    uint8_t* pNewBuffer = m_pBuffer;
     if (pNewBuffer) {
         pNewBuffer = FX_Realloc(uint8_t, m_pBuffer, new_size);
     } else {
         pNewBuffer = FX_Alloc(uint8_t, new_size);
     }
     m_pBuffer = pNewBuffer;
     m_AllocSize = new_size;
 }
 void CFX_BinaryBuf::CopyData(const void* pStr, FX_STRSIZE size)
 {
@@ skipping 99 matching lines @@
 }
 CFX_WideTextBuf& CFX_WideTextBuf::operator << (int i)
 {
     char buf[32];
     FXSYS_itoa(i, buf, 10);
     FX_STRSIZE len = FXSYS_strlen(buf);
     if (m_AllocSize < m_DataSize + (FX_STRSIZE)(len * sizeof(FX_WCHAR))) {
         ExpandBuf(len * sizeof(FX_WCHAR));
     }
     ASSERT(m_pBuffer != NULL);
-    FX_LPWSTR str = (FX_WCHAR*)(m_pBuffer + m_DataSize);
+    FX_WCHAR* str = (FX_WCHAR*)(m_pBuffer + m_DataSize);
     for (FX_STRSIZE j = 0; j < len; j ++) {
         *str ++ = buf[j];
     }
     m_DataSize += len * sizeof(FX_WCHAR);
     return *this;
 }
 CFX_WideTextBuf& CFX_WideTextBuf::operator << (double f)
 {
     char buf[32];
     FX_STRSIZE len = FX_ftoa((FX_FLOAT)f, buf);
     if (m_AllocSize < m_DataSize + (FX_STRSIZE)(len * sizeof(FX_WCHAR))) {
         ExpandBuf(len * sizeof(FX_WCHAR));
     }
     ASSERT(m_pBuffer != NULL);
-    FX_LPWSTR str = (FX_WCHAR*)(m_pBuffer + m_DataSize);
+    FX_WCHAR* str = (FX_WCHAR*)(m_pBuffer + m_DataSize);
     for (FX_STRSIZE i = 0; i < len; i ++) {
         *str ++ = buf[i];
     }
     m_DataSize += len * sizeof(FX_WCHAR);
     return *this;
 }
-CFX_WideTextBuf& CFX_WideTextBuf::operator << (FX_LPCWSTR lpsz)
+CFX_WideTextBuf& CFX_WideTextBuf::operator << (const FX_WCHAR* lpsz)
 {
     AppendBlock(lpsz, FXSYS_wcslen(lpsz)*sizeof(FX_WCHAR));
     return *this;
 }
 CFX_WideTextBuf& CFX_WideTextBuf::operator << (const CFX_WideTextBuf& buf)
 {
     AppendBlock(buf.m_pBuffer, buf.m_DataSize);
     return *this;
 }
 void CFX_WideTextBuf::operator =(FX_WSTR str)
 {
     CopyData(str.GetPtr(), str.GetLength() * sizeof(FX_WCHAR));
 }
 CFX_WideStringC CFX_WideTextBuf::GetWideString() const
 {
-    return CFX_WideStringC((FX_LPCWSTR)m_pBuffer, m_DataSize / sizeof(FX_WCHAR));
+    return CFX_WideStringC((const FX_WCHAR*)m_pBuffer, m_DataSize / sizeof(FX_WCHAR));
 }
 CFX_ArchiveSaver& CFX_ArchiveSaver::operator << (uint8_t i)
 {
     if (m_pStream) {
         m_pStream->WriteBlock(&i, 1);
     } else {
         m_SavingBuf.AppendByte(i);
     }
     return *this;
 }
@@ skipping 29 matching lines @@
     int len = bstr.GetLength();
     if (m_pStream) {
         m_pStream->WriteBlock(&len, sizeof(int));
         m_pStream->WriteBlock(bstr.GetPtr(), len);
     } else {
         m_SavingBuf.AppendBlock(&len, sizeof(int));
         m_SavingBuf.AppendBlock(bstr.GetPtr(), len);
     }
     return *this;
 }
-CFX_ArchiveSaver& CFX_ArchiveSaver::operator << (FX_LPCWSTR wstr)
+CFX_ArchiveSaver& CFX_ArchiveSaver::operator << (const FX_WCHAR* wstr)
 {
     FX_STRSIZE len = FXSYS_wcslen(wstr);
     if (m_pStream) {
         m_pStream->WriteBlock(&len, sizeof(int));
         m_pStream->WriteBlock(wstr, len);
     } else {
         m_SavingBuf.AppendBlock(&len, sizeof(int));
         m_SavingBuf.AppendBlock(wstr, len);
     }
     return *this;
 }
 CFX_ArchiveSaver& CFX_ArchiveSaver::operator << (const CFX_WideString& wstr)
 {
     CFX_ByteString encoded = wstr.UTF16LE_Encode();
     return operator << (encoded);
 }
 void CFX_ArchiveSaver::Write(const void* pData, FX_STRSIZE dwSize)
 {
     if (m_pStream) {
         m_pStream->WriteBlock(pData, dwSize);
     } else {
         m_SavingBuf.AppendBlock(pData, dwSize);
     }
 }
-CFX_ArchiveLoader::CFX_ArchiveLoader(FX_LPCBYTE pData, FX_DWORD dwSize)
+CFX_ArchiveLoader::CFX_ArchiveLoader(const uint8_t* pData, FX_DWORD dwSize)
 {
     m_pLoadingBuf = pData;
     m_LoadingPos = 0;
     m_LoadingSize = dwSize;
 }
 FX_BOOL CFX_ArchiveLoader::IsEOF()
 {
     return m_LoadingPos >= m_LoadingSize;
 }
 CFX_ArchiveLoader& CFX_ArchiveLoader::operator >> (uint8_t& i)
@@ skipping 23 matching lines @@
 {
     if (m_LoadingPos + 4 > m_LoadingSize) {
         return *this;
     }
     int len;
     operator >> (len);
     str.Empty();
     if (len <= 0 || m_LoadingPos + len > m_LoadingSize) {
         return *this;
     }
-    FX_LPSTR buffer = str.GetBuffer(len);
+    FX_CHAR* buffer = str.GetBuffer(len);
     FXSYS_memcpy32(buffer, m_pLoadingBuf + m_LoadingPos, len);
     str.ReleaseBuffer(len);
     m_LoadingPos += len;
     return *this;
 }
 CFX_ArchiveLoader& CFX_ArchiveLoader::operator >> (CFX_WideString& str)
 {
     CFX_ByteString encoded;
     operator >> (encoded);
     str = CFX_WideString::FromUTF16LE((const unsigned short*)encoded.c_str(), encoded.GetLength());
     return *this;
 }
 FX_BOOL CFX_ArchiveLoader::Read(void* pBuf, FX_DWORD dwSize)
 {
     if (m_LoadingPos + dwSize > m_LoadingSize) {
         return FALSE;
     }
     FXSYS_memcpy32(pBuf, m_pLoadingBuf + m_LoadingPos, dwSize);
     m_LoadingPos += dwSize;
     return TRUE;
 }
-void CFX_BitStream::Init(FX_LPCBYTE pData, FX_DWORD dwSize)
+void CFX_BitStream::Init(const uint8_t* pData, FX_DWORD dwSize)
 {
     m_pData = pData;
     m_BitSize = dwSize * 8;
     m_BitPos = 0;
 }
 void CFX_BitStream::ByteAlign()
 {
     int mod = m_BitPos % 8;
     if (mod == 0) {
         return;
@@ skipping 53 matching lines @@
     return bRet;
 }
 int32_t IFX_BufferArchive::AppendBlock(const void* pBuf, size_t size)
 {
     if (!pBuf || size < 1) {
         return 0;
     }
     if (!m_pBuffer) {
         m_pBuffer = FX_Alloc(uint8_t, m_BufSize);
     }
-    FX_LPBYTE buffer = (FX_LPBYTE)pBuf;
+    uint8_t* buffer = (uint8_t*)pBuf;
     FX_STRSIZE temp_size = (FX_STRSIZE)size;
     while (temp_size > 0) {
         FX_STRSIZE buf_size = FX_MIN(m_BufSize - m_Length, (FX_STRSIZE)temp_size);
         FXSYS_memcpy32(m_pBuffer + m_Length, buffer, buf_size);
         m_Length += buf_size;
         if (m_Length == m_BufSize) {
             if (!Flush()) {
                 return -1;
             }
         }
@@ skipping 40 matching lines @@
     if (!pFile) {
         return FALSE;
     }
     if (m_pFile && m_bTakeover) {
         m_pFile->Release();
     }
     m_pFile = pFile;
     m_bTakeover = bTakeover;
     return TRUE;
 }
-FX_BOOL CFX_FileBufferArchive::AttachFile(FX_LPCWSTR filename)
+FX_BOOL CFX_FileBufferArchive::AttachFile(const FX_WCHAR* filename)
 {
     if (!filename) {
         return FALSE;
     }
     if (m_pFile && m_bTakeover) {
         m_pFile->Release();
     }
     m_pFile = FX_CreateFileWrite(filename);
     if (!m_pFile) {
         return FALSE;
     }
     m_bTakeover = TRUE;
     return TRUE;
 }
-FX_BOOL CFX_FileBufferArchive::AttachFile(FX_LPCSTR filename)
+FX_BOOL CFX_FileBufferArchive::AttachFile(const FX_CHAR* filename)
 {
     if (!filename) {
         return FALSE;
     }
     if (m_pFile && m_bTakeover) {
         m_pFile->Release();
     }
     m_pFile = FX_CreateFileWrite(filename);
     if (!m_pFile) {
         return FALSE;
     }
     m_bTakeover = TRUE;
     return TRUE;
 }
 FX_BOOL CFX_FileBufferArchive::DoWork(const void* pBuf, size_t size)
 {
     if (!m_pFile) {
         return FALSE;
     }
     if (!pBuf || size < 1) {
         return TRUE;
     }
     return m_pFile->WriteBlock(pBuf, size);
 }