From 1c5d0b48ec7a6443ba72fec2a58a65fc6d694aca Mon Sep 17 00:00:00 2001
From: Dan Sinclair <dsinclair@chromium.org>
Date: Mon, 3 Apr 2017 15:05:11 -0400
Subject: Drop FXSYS_ from mem methods

This Cl drops the FXSYS_ from mem methods which are the same on all
platforms.

Bug: pdfium:694
Change-Id: I9d5ae905997dbaaec5aa0b2ae4c07358ed9c6236
Reviewed-on: https://pdfium-review.googlesource.com/3613
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
---
 fxbarcode/common/BC_CommonBitMatrix.cpp  |  6 +++---
 fxbarcode/common/BC_CommonByteArray.cpp  | 12 ++++++------
 fxbarcode/common/BC_CommonByteMatrix.cpp |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'fxbarcode/common')

diff --git a/fxbarcode/common/BC_CommonBitMatrix.cpp b/fxbarcode/common/BC_CommonBitMatrix.cpp
index 95f5e4640e..a3e20ed28e 100644
--- a/fxbarcode/common/BC_CommonBitMatrix.cpp
+++ b/fxbarcode/common/BC_CommonBitMatrix.cpp
@@ -36,7 +36,7 @@ void CBC_CommonBitMatrix::Init(int32_t dimension) {
   int32_t rowSize = (m_height + 31) >> 5;
   m_rowSize = rowSize;
   m_bits = FX_Alloc2D(int32_t, m_rowSize, m_height);
-  FXSYS_memset(m_bits, 0, m_rowSize * m_height * sizeof(int32_t));
+  memset(m_bits, 0, m_rowSize * m_height * sizeof(int32_t));
 }
 void CBC_CommonBitMatrix::Init(int32_t width, int32_t height) {
   m_width = width;
@@ -44,7 +44,7 @@ void CBC_CommonBitMatrix::Init(int32_t width, int32_t height) {
   int32_t rowSize = (width + 31) >> 5;
   m_rowSize = rowSize;
   m_bits = FX_Alloc2D(int32_t, m_rowSize, m_height);
-  FXSYS_memset(m_bits, 0, m_rowSize * m_height * sizeof(int32_t));
+  memset(m_bits, 0, m_rowSize * m_height * sizeof(int32_t));
 }
 CBC_CommonBitMatrix::~CBC_CommonBitMatrix() {
   FX_Free(m_bits);
@@ -71,7 +71,7 @@ void CBC_CommonBitMatrix::Flip(int32_t x, int32_t y) {
   m_bits[offset] ^= 1 << (x & 0x1f);
 }
 void CBC_CommonBitMatrix::Clear() {
-  FXSYS_memset(m_bits, 0, m_rowSize * m_height * sizeof(int32_t));
+  memset(m_bits, 0, m_rowSize * m_height * sizeof(int32_t));
 }
 void CBC_CommonBitMatrix::SetRegion(int32_t left,
                                     int32_t top,
diff --git a/fxbarcode/common/BC_CommonByteArray.cpp b/fxbarcode/common/BC_CommonByteArray.cpp
index a271de6015..b670ba3b75 100644
--- a/fxbarcode/common/BC_CommonByteArray.cpp
+++ b/fxbarcode/common/BC_CommonByteArray.cpp
@@ -32,13 +32,13 @@ CBC_CommonByteArray::CBC_CommonByteArray() {
 CBC_CommonByteArray::CBC_CommonByteArray(int32_t size) {
   m_size = size;
   m_bytes = FX_Alloc(uint8_t, size);
-  FXSYS_memset(m_bytes, 0, size);
+  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_memcpy(m_bytes, byteArray, size);
+  memcpy(m_bytes, byteArray, size);
   m_index = size;
 }
 CBC_CommonByteArray::~CBC_CommonByteArray() {
@@ -68,10 +68,10 @@ void CBC_CommonByteArray::Reserve(int32_t capacity) {
   if (!m_bytes || m_size < capacity) {
     uint8_t* newArray = FX_Alloc(uint8_t, capacity);
     if (m_bytes) {
-      FXSYS_memcpy(newArray, m_bytes, m_size);
-      FXSYS_memset(newArray + m_size, 0, capacity - m_size);
+      memcpy(newArray, m_bytes, m_size);
+      memset(newArray + m_size, 0, capacity - m_size);
     } else {
-      FXSYS_memset(newArray, 0, capacity);
+      memset(newArray, 0, capacity);
     }
     FX_Free(m_bytes);
     m_bytes = newArray;
@@ -82,7 +82,7 @@ void CBC_CommonByteArray::Set(uint8_t* source, int32_t offset, int32_t count) {
   FX_Free(m_bytes);
   m_bytes = FX_Alloc(uint8_t, count);
   m_size = count;
-  FXSYS_memcpy(m_bytes, source + offset, count);
+  memcpy(m_bytes, source + offset, count);
   m_index = count;
 }
 void CBC_CommonByteArray::Set(std::vector<uint8_t>* source,
diff --git a/fxbarcode/common/BC_CommonByteMatrix.cpp b/fxbarcode/common/BC_CommonByteMatrix.cpp
index 44c783248f..2ab1e9ac50 100644
--- a/fxbarcode/common/BC_CommonByteMatrix.cpp
+++ b/fxbarcode/common/BC_CommonByteMatrix.cpp
@@ -30,7 +30,7 @@ CBC_CommonByteMatrix::CBC_CommonByteMatrix(int32_t width, int32_t height) {
 }
 void CBC_CommonByteMatrix::Init() {
   m_bytes = FX_Alloc2D(uint8_t, m_height, m_width);
-  FXSYS_memset(m_bytes, 0xff, m_height * m_width);
+  memset(m_bytes, 0xff, m_height * m_width);
 }
 CBC_CommonByteMatrix::~CBC_CommonByteMatrix() {
   FX_Free(m_bytes);
-- 
cgit v1.2.3