From 8e4c505ff6d82263183e9f812fcc7b45c1414f15 Mon Sep 17 00:00:00 2001 From: tsepez Date: Thu, 14 Apr 2016 13:42:44 -0700 Subject: Rename CFX_ByteTextBuf::GetByteString() to AsStringC(). Do the same for CFX_WideTextBuf as well. The name is confusing because these return CFX_ByteStringC, not CFX_ByteString. The AsStringC naming gives parallelism with the string types themselves, and may help to indicate that the result is only good for the lifetime of the object being operated upon. Review URL: https://codereview.chromium.org/1886263003 --- core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp | 6 +++--- core/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp | 6 +++--- core/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'core/fpdfapi') diff --git a/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp b/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp index 940881bacb..cf29aa2684 100644 --- a/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp +++ b/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp @@ -562,7 +562,7 @@ CFX_ByteString CPDF_StreamParser::ReadString() { if (buf.GetLength() > MAX_STRING_LENGTH) { return CFX_ByteString(buf.GetBuffer(), MAX_STRING_LENGTH); } - return buf.GetByteString(); + return buf.AsStringC(); } parlevel--; buf.AppendChar(')'); @@ -641,7 +641,7 @@ CFX_ByteString CPDF_StreamParser::ReadString() { if (buf.GetLength() > MAX_STRING_LENGTH) { return CFX_ByteString(buf.GetBuffer(), MAX_STRING_LENGTH); } - return buf.GetByteString(); + return buf.AsStringC(); } CFX_ByteString CPDF_StreamParser::ReadHexString() { @@ -675,7 +675,7 @@ CFX_ByteString CPDF_StreamParser::ReadHexString() { if (buf.GetLength() > MAX_STRING_LENGTH) return CFX_ByteString(buf.GetBuffer(), MAX_STRING_LENGTH); - return buf.GetByteString(); + return buf.AsStringC(); } bool CPDF_StreamParser::PositionIsInBounds() const { diff --git a/core/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp b/core/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp index 5c3398d50a..889b58e928 100644 --- a/core/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp +++ b/core/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp @@ -218,7 +218,7 @@ CFX_ByteString CPDF_SyntaxParser::ReadString() { case 0: if (ch == ')') { if (parlevel == 0) { - return buf.GetByteString(); + return buf.AsStringC(); } parlevel--; buf.AppendChar(')'); @@ -291,7 +291,7 @@ CFX_ByteString CPDF_SyntaxParser::ReadString() { } GetNextChar(ch); - return buf.GetByteString(); + return buf.AsStringC(); } CFX_ByteString CPDF_SyntaxParser::ReadHexString() { @@ -323,7 +323,7 @@ CFX_ByteString CPDF_SyntaxParser::ReadHexString() { if (!bFirst) buf.AppendByte(code); - return buf.GetByteString(); + return buf.AsStringC(); } void CPDF_SyntaxParser::ToNextLine() { diff --git a/core/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp b/core/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp index 5e71002d4d..5f8d425b96 100644 --- a/core/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp +++ b/core/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp @@ -530,7 +530,7 @@ CFX_ByteString PDF_EncodeString(const CFX_ByteString& src, FX_BOOL bHex) { result.AppendChar("0123456789ABCDEF"[src[i] % 16]); } result.AppendChar('>'); - return result.GetByteString(); + return result.AsStringC(); } result.AppendChar('('); for (int i = 0; i < srclen; i++) { @@ -547,7 +547,7 @@ CFX_ByteString PDF_EncodeString(const CFX_ByteString& src, FX_BOOL bHex) { result.AppendChar(ch); } result.AppendChar(')'); - return result.GetByteString(); + return result.AsStringC(); } void FlateEncode(const uint8_t* src_buf, -- cgit v1.2.3