2 files changed, 28 insertions, 28 deletions

diff --git a/xfa/src/fgas/src/crt/fx_memory.cpp b/xfa/src/fgas/src/crt/fx_memory.cpp
index 39391d4da0..f3d0f10aa3 100644
--- a/xfa/src/fgas/src/crt/fx_memory.cpp
+++ b/xfa/src/fgas/src/crt/fx_memory.cpp
@@ -33,7 +33,7 @@ CFX_StaticStore::CFX_StaticStore(size_t iDefChunkSize)
   FXSYS_assert(m_iDefChunkSize != 0);

 }

 CFX_StaticStore::~CFX_StaticStore() {

-  register FX_LPSTATICSTORECHUNK pChunk, pNext;

+  FX_LPSTATICSTORECHUNK pChunk, pNext;

   pChunk = m_pChunk;

   while (pChunk != NULL) {

     pNext = pChunk->pNextChunk;

@@ -43,7 +43,7 @@ CFX_StaticStore::~CFX_StaticStore() {
 }

 FX_LPSTATICSTORECHUNK CFX_StaticStore::AllocChunk(size_t size) {

   FXSYS_assert(size != 0);

-  register FX_LPSTATICSTORECHUNK pChunk = (FX_LPSTATICSTORECHUNK)FX_Alloc(

+  FX_LPSTATICSTORECHUNK pChunk = (FX_LPSTATICSTORECHUNK)FX_Alloc(

       uint8_t, sizeof(FX_STATICSTORECHUNK) + size);

   if (pChunk == NULL) {

     return NULL;

@@ -69,9 +69,9 @@ FX_LPSTATICSTORECHUNK CFX_StaticStore::FindChunk(size_t size) {
 void* CFX_StaticStore::Alloc(size_t size) {

   size = FX_4BYTEALIGN(size);

   FXSYS_assert(size != 0);

-  register FX_LPSTATICSTORECHUNK pChunk = FindChunk(size);

+  FX_LPSTATICSTORECHUNK pChunk = FindChunk(size);

   FXSYS_assert(pChunk != NULL && pChunk->iFreeSize >= size);

-  register uint8_t* p = (uint8_t*)pChunk;

+  uint8_t* p = (uint8_t*)pChunk;

   p += sizeof(FX_STATICSTORECHUNK) + pChunk->iChunkSize - pChunk->iFreeSize;

   pChunk->iFreeSize -= size;

   m_iAllocatedSize += size;

@@ -90,7 +90,7 @@ CFX_FixedStore::CFX_FixedStore(size_t iBlockSize, size_t iBlockNumsInChunk)
   FXSYS_assert(m_iBlockSize != 0 && m_iDefChunkSize != 0);

 }

 CFX_FixedStore::~CFX_FixedStore() {

-  register FX_LPFIXEDSTORECHUNK pChunk, pNext;

+  FX_LPFIXEDSTORECHUNK pChunk, pNext;

   pChunk = m_pChunk;

   while (pChunk != NULL) {

     pNext = pChunk->pNextChunk;

@@ -101,7 +101,7 @@ CFX_FixedStore::~CFX_FixedStore() {
 FX_LPFIXEDSTORECHUNK CFX_FixedStore::AllocChunk() {

   int32_t iTotalSize = sizeof(FX_FIXEDSTORECHUNK) + m_iDefChunkSize +

                        m_iBlockSize * m_iDefChunkSize;

-  register FX_LPFIXEDSTORECHUNK pChunk =

+  FX_LPFIXEDSTORECHUNK pChunk =

       (FX_LPFIXEDSTORECHUNK)FX_Alloc(uint8_t, iTotalSize);

   if (pChunk == NULL) {

     return NULL;

@@ -117,7 +117,7 @@ void* CFX_FixedStore::Alloc(size_t size) {
   if (size > m_iBlockSize) {

     return NULL;

   }

-  register FX_LPFIXEDSTORECHUNK pChunk = m_pChunk;

+  FX_LPFIXEDSTORECHUNK pChunk = m_pChunk;

   while (pChunk != NULL) {

     if (pChunk->iFreeNum > 0) {

       break;

@@ -128,8 +128,8 @@ void* CFX_FixedStore::Alloc(size_t size) {
     pChunk = AllocChunk();

   }

   FXSYS_assert(pChunk != NULL);

-  register uint8_t* pFlags = pChunk->FirstFlag();

-  register size_t i = 0;

+  uint8_t* pFlags = pChunk->FirstFlag();

+  size_t i = 0;

   for (; i < pChunk->iChunkSize; i++)

     if (pFlags[i] == 0) {

       break;

@@ -141,7 +141,7 @@ void* CFX_FixedStore::Alloc(size_t size) {
 }

 void CFX_FixedStore::Free(void* pBlock) {

   FXSYS_assert(pBlock != NULL);

-  register FX_LPFIXEDSTORECHUNK pPrior, pChunk;

+  FX_LPFIXEDSTORECHUNK pPrior, pChunk;

   pPrior = NULL, pChunk = m_pChunk;

   uint8_t* pStart = NULL;

   uint8_t* pEnd;

@@ -156,9 +156,9 @@ void CFX_FixedStore::Free(void* pBlock) {
     pPrior = pChunk, pChunk = pChunk->pNextChunk;

   }

   FXSYS_assert(pChunk != NULL);

-  register size_t iPos = ((uint8_t*)pBlock - pStart) / m_iBlockSize;

+  size_t iPos = ((uint8_t*)pBlock - pStart) / m_iBlockSize;

   FXSYS_assert(iPos < pChunk->iChunkSize);

-  register uint8_t* pFlags = pChunk->FirstFlag();

+  uint8_t* pFlags = pChunk->FirstFlag();

   if (pFlags[iPos] == 0) {

     return;

   }

@@ -185,7 +185,7 @@ CFX_DynamicStore::CFX_DynamicStore(size_t iDefChunkSize)
   FXSYS_assert(m_iDefChunkSize != 0);

 }

 CFX_DynamicStore::~CFX_DynamicStore() {

-  register FX_LPDYNAMICSTORECHUNK pChunk, pNext;

+  FX_LPDYNAMICSTORECHUNK pChunk, pNext;

   pChunk = m_pChunk;

   while (pChunk != NULL) {

     pNext = pChunk->pNextChunk;

@@ -195,7 +195,7 @@ CFX_DynamicStore::~CFX_DynamicStore() {
 }

 FX_LPDYNAMICSTORECHUNK CFX_DynamicStore::AllocChunk(size_t size) {

   FXSYS_assert(size != 0);

-  register FX_LPDYNAMICSTORECHUNK pChunk = (FX_LPDYNAMICSTORECHUNK)FX_Alloc(

+  FX_LPDYNAMICSTORECHUNK pChunk = (FX_LPDYNAMICSTORECHUNK)FX_Alloc(

       uint8_t,

       sizeof(FX_DYNAMICSTORECHUNK) + sizeof(FX_DYNAMICSTOREBLOCK) * 2 + size);

   if (pChunk == NULL) {

@@ -203,7 +203,7 @@ FX_LPDYNAMICSTORECHUNK CFX_DynamicStore::AllocChunk(size_t size) {
   }

   pChunk->iChunkSize = size;

   pChunk->iFreeSize = size;

-  register FX_LPDYNAMICSTOREBLOCK pBlock = pChunk->FirstBlock();

+  FX_LPDYNAMICSTOREBLOCK pBlock = pChunk->FirstBlock();

   pBlock->iBlockSize = size;

   pBlock->bUsed = FALSE;

   pBlock = pBlock->NextBlock();

@@ -225,12 +225,12 @@ FX_LPDYNAMICSTORECHUNK CFX_DynamicStore::AllocChunk(size_t size) {
 void* CFX_DynamicStore::Alloc(size_t size) {

   size = FX_4BYTEALIGN(size);

   FXSYS_assert(size != 0);

-  register FX_LPDYNAMICSTORECHUNK pChunk = m_pChunk;

-  register FX_LPDYNAMICSTOREBLOCK pBlock = NULL;

+  FX_LPDYNAMICSTORECHUNK pChunk = m_pChunk;

+  FX_LPDYNAMICSTOREBLOCK pBlock = NULL;

   while (pChunk != NULL) {

     if (pChunk->iFreeSize >= size) {

       pBlock = pChunk->FirstBlock();

-      register FX_BOOL bFind = FALSE;

+      FX_BOOL bFind = FALSE;

       while (pBlock->iBlockSize != 0) {

         if (!pBlock->bUsed && pBlock->iBlockSize >= size) {

           bFind = TRUE;

@@ -249,12 +249,12 @@ void* CFX_DynamicStore::Alloc(size_t size) {
     pBlock = pChunk->FirstBlock();

   }

   FXSYS_assert(pChunk != NULL && pBlock != NULL);

-  register size_t m = size + sizeof(FX_DYNAMICSTOREBLOCK);

+  size_t m = size + sizeof(FX_DYNAMICSTOREBLOCK);

   pBlock->bUsed = TRUE;

   if (pBlock->iBlockSize > m) {

-    register size_t n = pBlock->iBlockSize;

+    size_t n = pBlock->iBlockSize;

     pBlock->iBlockSize = size;

-    register FX_LPDYNAMICSTOREBLOCK pNextBlock = pBlock->NextBlock();

+    FX_LPDYNAMICSTOREBLOCK pNextBlock = pBlock->NextBlock();

     pNextBlock->bUsed = FALSE;

     pNextBlock->iBlockSize = n - size - sizeof(FX_DYNAMICSTOREBLOCK);

     pChunk->iFreeSize -= size + sizeof(FX_DYNAMICSTOREBLOCK);

@@ -265,7 +265,7 @@ void* CFX_DynamicStore::Alloc(size_t size) {
 }

 void CFX_DynamicStore::Free(void* pBlock) {

   FXSYS_assert(pBlock != NULL);

-  register FX_LPDYNAMICSTORECHUNK pPriorChunk, pChunk;

+  FX_LPDYNAMICSTORECHUNK pPriorChunk, pChunk;

   pPriorChunk = NULL, pChunk = m_pChunk;

   while (pChunk != NULL) {

     if (pBlock > pChunk &&

@@ -276,7 +276,7 @@ void CFX_DynamicStore::Free(void* pBlock) {
     pPriorChunk = pChunk, pChunk = pChunk->pNextChunk;

   }

   FXSYS_assert(pChunk != NULL);

-  register FX_LPDYNAMICSTOREBLOCK pPriorBlock, pFindBlock;

+  FX_LPDYNAMICSTOREBLOCK pPriorBlock, pFindBlock;

   pPriorBlock = NULL, pFindBlock = pChunk->FirstBlock();

   while (pFindBlock->iBlockSize != 0) {

     if (pBlock == (void*)pFindBlock->Data()) {

@@ -295,8 +295,8 @@ void CFX_DynamicStore::Free(void* pBlock) {
     pPriorBlock = pFindBlock;

   }

   pFindBlock = pPriorBlock;

-  register size_t sizeFree = 0;

-  register size_t sizeBlock = 0;

+  size_t sizeFree = 0;

+  size_t sizeBlock = 0;

   while (pFindBlock->iBlockSize != 0 && !pFindBlock->bUsed) {

     if (pFindBlock != pPriorBlock) {

       sizeFree += sizeof(FX_DYNAMICSTOREBLOCK);

diff --git a/xfa/src/fgas/src/crt/fx_stream.cpp b/xfa/src/fgas/src/crt/fx_stream.cpp
index 21b5ea3764..11ce71f9a3 100644
--- a/xfa/src/fgas/src/crt/fx_stream.cpp
+++ b/xfa/src/fgas/src/crt/fx_stream.cpp
@@ -1175,12 +1175,12 @@ IFX_Stream* CFX_Stream::CreateSharedStream(FX_DWORD dwAccess,
       (dwAccess & FX_STREAMACCESS_Write) != 0) {

     return NULL;

   }

-  register int32_t iStart = m_iStart + iOffset;

-  register int32_t iTotal = m_iStart + m_iLength;

+  int32_t iStart = m_iStart + iOffset;

+  int32_t iTotal = m_iStart + m_iLength;

   if (iStart < m_iStart || iStart >= iTotal) {

     return NULL;

   }

-  register int32_t iEnd = iStart + iLength;

+  int32_t iEnd = iStart + iLength;

   if (iEnd < iStart || iEnd > iTotal) {

     return NULL;

   }