summaryrefslogtreecommitdiff
path: root/xfa/fxfa/fm2js/xfa_lexer.cpp
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-04-06 06:27:29 -0700
committerCommit bot <commit-bot@chromium.org>2016-04-06 06:27:29 -0700
commit660956f58af305d72c64bb87c05f694469846df2 (patch)
tree5a73d1df3512213bcecb28114f9d51cec86fca0d /xfa/fxfa/fm2js/xfa_lexer.cpp
parent54750b570d32898c8ebd4fa59105bfd3b96043af (diff)
downloadpdfium-660956f58af305d72c64bb87c05f694469846df2.tar.xz
Rename CFX_WideStringC::raw_str() to c_str()
No functional change intended. This difference in naming is standing in the way of consolidating some of the string code between Wide and Byte strings. The Wide code wants to call raw_str() in exactly the same spots that the Byte code calls c_str(). This makes sense, because in both places we get a character type back, and not a uint*_t type. If WideStringC had a raw_str() method, it would have to return uint32_t or similar. R=dsinclair@chromium.org Review URL: https://codereview.chromium.org/1863593004
Diffstat (limited to 'xfa/fxfa/fm2js/xfa_lexer.cpp')
-rw-r--r--xfa/fxfa/fm2js/xfa_lexer.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/xfa/fxfa/fm2js/xfa_lexer.cpp b/xfa/fxfa/fm2js/xfa_lexer.cpp
index b4c16eb8e4..4462bd5154 100644
--- a/xfa/fxfa/fm2js/xfa_lexer.cpp
+++ b/xfa/fxfa/fm2js/xfa_lexer.cpp
@@ -165,9 +165,7 @@ CXFA_FMToken::CXFA_FMToken(uint32_t uLineNum)
CXFA_FMLexer::CXFA_FMLexer(const CFX_WideStringC& wsFormCalc,
CXFA_FMErrorInfo* pErrorInfo)
- : m_ptr(wsFormCalc.raw_str()),
- m_uCurrentLine(1),
- m_pErrorInfo(pErrorInfo) {}
+ : m_ptr(wsFormCalc.c_str()), m_uCurrentLine(1), m_pErrorInfo(pErrorInfo) {}
CXFA_FMToken* CXFA_FMLexer::NextToken() {
m_pToken.reset(Scan());
@@ -519,7 +517,7 @@ void CXFA_FMLexer::Comment(const FX_WCHAR* p, const FX_WCHAR*& pEnd) {
XFA_FM_TOKEN CXFA_FMLexer::IsKeyword(const CFX_WideStringC& str) {
int32_t iLength = str.GetLength();
- uint32_t uHash = FX_HashCode_String_GetW(str.raw_str(), iLength, TRUE);
+ uint32_t uHash = FX_HashCode_String_GetW(str.c_str(), iLength, TRUE);
int32_t iStart = KEYWORD_START, iEnd = KEYWORD_END;
int32_t iMid = (iStart + iEnd) / 2;
XFA_FMKeyword keyword;