diff options
| author | tsepez <tsepez@chromium.org> | 2016-04-25 11:23:43 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-25 11:23:43 -0700 |
| commit | b6853cfe4fd1ee089dfdd0cb09bbc4063532ef82 (patch) | |
| tree | 1404031e845c8b4b09d5a68fd81f09a7d2865d59 /xfa/fgas/crt/fgas_codepage.cpp | |
| parent | 2a8a20cde4c8e2294f6868bb097fe450960a709f (diff) | |
| download | pdfium-b6853cfe4fd1ee089dfdd0cb09bbc4063532ef82.tar.xz | |
Pass CFX_*StringCs to FX_HashCode_GETA and _GETW hash functions.
Too many calls were of the form fn(x.c_str(), x.GetLength())
which is an anti-pattern given the StringC classes which tie
these together.
There are a few places where explicit CFX_*StringCs are
constructed, but this can be avoided by changing the args
to these functions in the same manner.
Removed String_ from name of functions since it added
little value. Also removed default argument.
Review URL: https://codereview.chromium.org/1919563002
Diffstat (limited to 'xfa/fgas/crt/fgas_codepage.cpp')
| -rw-r--r-- | xfa/fgas/crt/fgas_codepage.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xfa/fgas/crt/fgas_codepage.cpp b/xfa/fgas/crt/fgas_codepage.cpp index 4734a0005e..36c40a6469 100644 --- a/xfa/fgas/crt/fgas_codepage.cpp +++ b/xfa/fgas/crt/fgas_codepage.cpp @@ -309,12 +309,12 @@ uint16_t FX_GetCodePageFromStringA(const FX_CHAR* pStr, int32_t iLength) { if (iLength == 0) { return 0xFFFF; } - uint32_t uHash = FX_HashCode_String_GetA(pStr, iLength, TRUE); - int32_t iStart = 0, iMid; + uint32_t uHash = FX_HashCode_GetA(CFX_ByteStringC(pStr, iLength), true); + int32_t iStart = 0; int32_t iEnd = sizeof(g_FXCPHashTable) / sizeof(FX_STR2CPHASH) - 1; FXSYS_assert(iEnd >= 0); do { - iMid = (iStart + iEnd) / 2; + int32_t iMid = (iStart + iEnd) / 2; const FX_STR2CPHASH& cp = g_FXCPHashTable[iMid]; if (uHash == cp.uHash) { return (uint16_t)cp.uCodePage; |