diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-03-13 16:43:37 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-14 14:14:51 +0000 |
| commit | 812e96c2b4c5908a1979da5e27cdcecda0d1dfc9 (patch) | |
| tree | f0b0607f6b757eb22237527215094bd87b5d03ba /xfa/fxfa/app/xfa_ffwidget.cpp | |
| parent | 893822aa5b6254591f8e80fbffcbb4fa6ad849aa (diff) | |
| download | pdfium-812e96c2b4c5908a1979da5e27cdcecda0d1dfc9.tar.xz | |
Replace FX_CHAR and FX_WCHAR with underlying types.
Change-Id: I96e0a20d66b9184d22f64d8e4ce0dadd5a78c1e8
Reviewed-on: https://pdfium-review.googlesource.com/2967
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fxfa/app/xfa_ffwidget.cpp')
| -rw-r--r-- | xfa/fxfa/app/xfa_ffwidget.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/xfa/fxfa/app/xfa_ffwidget.cpp b/xfa/fxfa/app/xfa_ffwidget.cpp index 9995fd11b2..ad175349f6 100644 --- a/xfa/fxfa/app/xfa_ffwidget.cpp +++ b/xfa/fxfa/app/xfa_ffwidget.cpp @@ -923,7 +923,7 @@ static uint8_t* XFA_RemoveBase64Whitespace(const uint8_t* pStr, int32_t iLen) { uint8_t* pCP; int32_t i = 0, j = 0; if (iLen == 0) { - iLen = FXSYS_strlen((FX_CHAR*)pStr); + iLen = FXSYS_strlen((char*)pStr); } pCP = FX_Alloc(uint8_t, iLen + 1); for (; i < iLen; i++) { @@ -936,16 +936,16 @@ static uint8_t* XFA_RemoveBase64Whitespace(const uint8_t* pStr, int32_t iLen) { pCP[j] = '\0'; return pCP; } -static int32_t XFA_Base64Decode(const FX_CHAR* pStr, uint8_t* pOutBuffer) { +static int32_t XFA_Base64Decode(const char* pStr, uint8_t* pOutBuffer) { if (!pStr) { return 0; } uint8_t* pBuffer = - XFA_RemoveBase64Whitespace((uint8_t*)pStr, FXSYS_strlen((FX_CHAR*)pStr)); + XFA_RemoveBase64Whitespace((uint8_t*)pStr, FXSYS_strlen((char*)pStr)); if (!pBuffer) { return 0; } - int32_t iLen = FXSYS_strlen((FX_CHAR*)pBuffer); + int32_t iLen = FXSYS_strlen((char*)pBuffer); int32_t i = 0, j = 0; uint32_t dwLimb = 0; for (; i + 3 < iLen; i += 4) { @@ -982,14 +982,14 @@ static int32_t XFA_Base64Decode(const FX_CHAR* pStr, uint8_t* pOutBuffer) { return j; } -static const FX_CHAR g_base64_chars[] = +static const char g_base64_chars[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; -FX_CHAR* XFA_Base64Encode(const uint8_t* buf, int32_t buf_len) { - FX_CHAR* out = nullptr; +char* XFA_Base64Encode(const uint8_t* buf, int32_t buf_len) { + char* out = nullptr; int i, j; uint32_t limb; - out = FX_Alloc(FX_CHAR, ((buf_len * 8 + 5) / 6) + 5); + out = FX_Alloc(char, ((buf_len * 8 + 5) / 6) + 5); for (i = 0, j = 0, limb = 0; i + 2 < buf_len; i += 3, j += 4) { limb = ((uint32_t)buf[i] << 16) | ((uint32_t)buf[i + 1] << 8) | ((uint32_t)buf[i + 2]); |