From 58577fd17020f52314bba8989be964a8c2fd010d Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 10 May 2017 01:15:46 -0700 Subject: Use FXSYS_IntToTwoHexChars() in more places. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I84cd8e91a296119ecf80b7a092b886f291bebb45 Reviewed-on: https://pdfium-review.googlesource.com/4953 Reviewed-by: Tom Sepez Reviewed-by: Nicolás Peña Commit-Queue: Lei Zhang --- core/fxcrt/fx_extension.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'core/fxcrt') diff --git a/core/fxcrt/fx_extension.cpp b/core/fxcrt/fx_extension.cpp index 2b290ed79d..10b568ec9e 100644 --- a/core/fxcrt/fx_extension.cpp +++ b/core/fxcrt/fx_extension.cpp @@ -251,8 +251,6 @@ void FX_Random_GenerateBase(uint32_t* pBuffer, int32_t iCount) { } #ifdef PDF_ENABLE_XFA -static const char gs_FX_pHexChars[] = "0123456789ABCDEF"; - void FX_GUID_CreateV4(FX_GUID* pGUID) { FX_Random_GenerateMT((uint32_t*)pGUID, 4); uint8_t& b = ((uint8_t*)pGUID)[6]; @@ -264,8 +262,8 @@ CFX_ByteString FX_GUID_ToString(const FX_GUID* pGUID, bool bSeparator) { char* pBuf = bsStr.GetBuffer(40); for (int32_t i = 0; i < 16; i++) { uint8_t b = reinterpret_cast(pGUID)[i]; - *pBuf++ = gs_FX_pHexChars[b >> 4]; - *pBuf++ = gs_FX_pHexChars[b & 0x0F]; + FXSYS_IntToTwoHexChars(b, pBuf); + pBuf += 2; if (bSeparator && (i == 3 || i == 5 || i == 7 || i == 9)) *pBuf++ = L'-'; } -- cgit v1.2.3