From 6581175666ba4e1eb2826142376cbfe4495c6e76 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Thu, 11 Jun 2015 12:17:45 -0700
Subject: Merge to XFA: Kill FXSYS_mem{cpy,cmp,set.move}{32,8}.

Only manual merge was core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp
follwed by scripts.

Original Review URL: https://codereview.chromium.org/1179693003.
TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/1179953002.
---
 xfa/src/fxbarcode/common/BC_CommonBitArray.cpp   |  6 +++---
 xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp  |  6 +++---
 xfa/src/fxbarcode/common/BC_CommonByteArray.cpp  | 10 +++++-----
 xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'xfa/src/fxbarcode/common')

diff --git a/xfa/src/fxbarcode/common/BC_CommonBitArray.cpp b/xfa/src/fxbarcode/common/BC_CommonBitArray.cpp
index a73fd37148..71c5217cf9 100644
--- a/xfa/src/fxbarcode/common/BC_CommonBitArray.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonBitArray.cpp
@@ -71,7 +71,7 @@ void CBC_CommonBitArray::SetBulk(int32_t i, int32_t newBits)
 }
 void CBC_CommonBitArray::Clear()
 {
-    FXSYS_memset32(&m_bits[0], 0x00, m_bits.GetSize() * sizeof(int32_t));
+    FXSYS_memset(&m_bits[0], 0x00, m_bits.GetSize() * sizeof(int32_t));
 }
 FX_BOOL CBC_CommonBitArray::IsRange(int32_t start, int32_t end, FX_BOOL value, int32_t &e)
 {
@@ -111,7 +111,7 @@ int32_t* CBC_CommonBitArray::GetBitArray()
 void CBC_CommonBitArray::Reverse()
 {
     int32_t* newBits = FX_Alloc(int32_t, m_bits.GetSize());
-    FXSYS_memset32(newBits, 0x00, m_bits.GetSize() * sizeof(int32_t));
+    FXSYS_memset(newBits, 0x00, m_bits.GetSize() * sizeof(int32_t));
     int32_t size = m_size;
     int32_t i;
     for (i = 0; i < size; i++) {
@@ -119,6 +119,6 @@ void CBC_CommonBitArray::Reverse()
             newBits[i >> 5] |= 1 << (i & 0x1F);
         }
     }
-    FXSYS_memcpy32(&m_bits[0], newBits, m_bits.GetSize() * sizeof(int32_t));
+    FXSYS_memcpy(&m_bits[0], newBits, m_bits.GetSize() * sizeof(int32_t));
     FX_Free(newBits);
 }
diff --git a/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp
index 135dd2ff28..96dbed8d66 100644
--- a/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp
@@ -37,7 +37,7 @@ void CBC_CommonBitMatrix::Init(int32_t dimension)
     int32_t rowSize = (m_height + 31) >> 5;
     m_rowSize = rowSize;
     m_bits = FX_Alloc(int32_t, m_rowSize * m_height);
-    FXSYS_memset32(m_bits, 0, m_rowSize * m_height * sizeof(int32_t));
+    FXSYS_memset(m_bits, 0, m_rowSize * m_height * sizeof(int32_t));
 }
 void CBC_CommonBitMatrix::Init(int32_t width, int32_t height)
 {
@@ -46,7 +46,7 @@ void CBC_CommonBitMatrix::Init(int32_t width, int32_t height)
     int32_t rowSize = (width + 31) >> 5;
     m_rowSize = rowSize;
     m_bits = FX_Alloc(int32_t, m_rowSize * m_height);
-    FXSYS_memset32(m_bits, 0, m_rowSize * m_height * sizeof(int32_t));
+    FXSYS_memset(m_bits, 0, m_rowSize * m_height * sizeof(int32_t));
 }
 CBC_CommonBitMatrix::~CBC_CommonBitMatrix()
 {
@@ -83,7 +83,7 @@ void CBC_CommonBitMatrix::Flip(int32_t x, int32_t y)
 }
 void CBC_CommonBitMatrix::Clear()
 {
-    FXSYS_memset32(m_bits, 0, m_rowSize * m_height * sizeof(int32_t));
+    FXSYS_memset(m_bits, 0, m_rowSize * m_height * sizeof(int32_t));
 }
 void CBC_CommonBitMatrix::SetRegion(int32_t left, int32_t top, int32_t width, int32_t height, int32_t &e)
 {
diff --git a/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp b/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp
index 4b9667e406..bec79d2ba0 100644
--- a/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp
@@ -32,14 +32,14 @@ CBC_CommonByteArray::CBC_CommonByteArray(int32_t size)
 {
     m_size = size;
     m_bytes = FX_Alloc(uint8_t, size);
-    FXSYS_memset32(m_bytes, 0, size);
+    FXSYS_memset(m_bytes, 0, size);
     m_index = 0;
 }
 CBC_CommonByteArray::CBC_CommonByteArray(uint8_t* byteArray, int32_t size)
 {
     m_size = size;
     m_bytes = FX_Alloc(uint8_t, size);
-    FXSYS_memcpy32(m_bytes, byteArray, size);
+    FXSYS_memcpy(m_bytes, byteArray, size);
     m_index = size;
 }
 CBC_CommonByteArray::~CBC_CommonByteArray()
@@ -80,9 +80,9 @@ void CBC_CommonByteArray::Reserve(int32_t capacity)
 {
     if (m_bytes == NULL || m_size < capacity) {
         uint8_t *newArray = FX_Alloc(uint8_t, capacity);
-        FXSYS_memset32(newArray, 0, capacity);
+        FXSYS_memset(newArray, 0, capacity);
         if (m_bytes != NULL) {
-            FXSYS_memcpy32(newArray, m_bytes, m_size);
+            FXSYS_memcpy(newArray, m_bytes, m_size);
             FX_Free( m_bytes );
         }
         m_bytes = newArray;
@@ -96,7 +96,7 @@ void CBC_CommonByteArray::Set(uint8_t* source, int32_t offset, int32_t count)
     }
     m_bytes = FX_Alloc(uint8_t, count);
     m_size = count;
-    FXSYS_memcpy32(m_bytes, source + offset, count);
+    FXSYS_memcpy(m_bytes, source + offset, count);
     m_index = count;
 }
 void CBC_CommonByteArray::Set(CFX_ByteArray* source, int32_t offset, int32_t count)
diff --git a/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp b/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp
index da4741d11a..d963eb9f5e 100644
--- a/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp
@@ -31,7 +31,7 @@ CBC_CommonByteMatrix::CBC_CommonByteMatrix(int32_t width, int32_t height)
 void CBC_CommonByteMatrix::Init()
 {
     m_bytes = FX_Alloc(uint8_t, m_height * m_width);
-    FXSYS_memset8(m_bytes, 0xff, m_height * m_width);
+    FXSYS_memset(m_bytes, 0xff, m_height * m_width);
 }
 CBC_CommonByteMatrix::~CBC_CommonByteMatrix()
 {
-- 
cgit v1.2.3