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.

1 files changed, 5 insertions, 5 deletions

diff --git a/core/src/fxcodec/codec/fx_codec_png.cpp b/core/src/fxcodec/codec/fx_codec_png.cpp
index 55d66a3ccf..b96ccf6dec 100644
--- a/core/src/fxcodec/codec/fx_codec_png.cpp
+++ b/core/src/fxcodec/codec/fx_codec_png.cpp
@@ -50,7 +50,7 @@ static void _png_load_bmp_attribute(png_structp png_ptr, png_infop info_ptr, CFX
         png_timep t = NULL;

         png_get_tIME(png_ptr, info_ptr, &t);

         if (t) {

-            FXSYS_memset32(pAttribute->m_strTime, 0, sizeof(pAttribute->m_strTime));

+            FXSYS_memset(pAttribute->m_strTime, 0, sizeof(pAttribute->m_strTime));

             FXSYS_snprintf((FX_CHAR*)pAttribute->m_strTime, sizeof(pAttribute->m_strTime), "%4d:%2d:%2d %2d:%2d:%2d",

                            t->year, t->month, t->day, t->hour, t->minute, t->second);

             pAttribute->m_strTime[sizeof(pAttribute->m_strTime) - 1] = 0;

@@ -67,15 +67,15 @@ static void _png_load_bmp_attribute(png_structp png_ptr, png_infop info_ptr, CFX
         for (i = 0; i < num_text; i++) {

             len = (FX_DWORD)FXSYS_strlen(text[i].key);

             buf = "Time";

-            if (!FXSYS_memcmp32(buf, text[i].key, FX_MIN(len, FXSYS_strlen(buf)))) {

+            if (!FXSYS_memcmp(buf, text[i].key, FX_MIN(len, FXSYS_strlen(buf)))) {

                 if (!bTime) {

-                    FXSYS_memset32(pAttribute->m_strTime, 0, sizeof(pAttribute->m_strTime));

-                    FXSYS_memcpy32(pAttribute->m_strTime, text[i].text,

+                    FXSYS_memset(pAttribute->m_strTime, 0, sizeof(pAttribute->m_strTime));

+                    FXSYS_memcpy(pAttribute->m_strTime, text[i].text,

                                    FX_MIN(sizeof(pAttribute->m_strTime) - 1, text[i].text_length));

                 }

             } else {

                 buf = "Author";

-                if (!FXSYS_memcmp32(buf, text[i].key, FX_MIN(len, FXSYS_strlen(buf)))) {

+                if (!FXSYS_memcmp(buf, text[i].key, FX_MIN(len, FXSYS_strlen(buf)))) {

                     pAttribute->m_strAuthor.Empty();

                     pAttribute->m_strAuthor.Load((uint8_t*)text[i].text, (FX_STRSIZE)text[i].text_length);

                 }