From ec8ff7d258ef25f7e3193572aeef220ff86784f0 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 7 Apr 2017 16:58:00 -0700 Subject: Fix bytestring passing conventions, part 2. Change pass by reference to const reference or pointer. Change-Id: Ic007f14e6569679a846980a96cc627eac4ecd5d6 Reviewed-on: https://pdfium-review.googlesource.com/3953 Commit-Queue: Tom Sepez Reviewed-by: Lei Zhang --- core/fxcrt/xml/cxml_element.cpp | 12 ++++++------ core/fxcrt/xml/cxml_element.h | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'core/fxcrt/xml') diff --git a/core/fxcrt/xml/cxml_element.cpp b/core/fxcrt/xml/cxml_element.cpp index 20ad54e88c..17caebfa14 100644 --- a/core/fxcrt/xml/cxml_element.cpp +++ b/core/fxcrt/xml/cxml_element.cpp @@ -65,16 +65,16 @@ CFX_ByteString CXML_Element::GetNamespaceURI( } void CXML_Element::GetAttrByIndex(int index, - CFX_ByteString& space, - CFX_ByteString& name, - CFX_WideString& value) const { + CFX_ByteString* space, + CFX_ByteString* name, + CFX_WideString* value) const { if (index < 0 || index >= m_AttrMap.GetSize()) return; CXML_AttrItem& item = m_AttrMap.GetAt(index); - space = item.m_QSpaceName; - name = item.m_AttrName; - value = item.m_Value; + *space = item.m_QSpaceName; + *name = item.m_AttrName; + *value = item.m_Value; } bool CXML_Element::HasAttr(const CFX_ByteStringC& name) const { diff --git a/core/fxcrt/xml/cxml_element.h b/core/fxcrt/xml/cxml_element.h index 2e18e187b7..349deba2c8 100644 --- a/core/fxcrt/xml/cxml_element.h +++ b/core/fxcrt/xml/cxml_element.h @@ -31,9 +31,9 @@ class CXML_Element { const CXML_Element* GetParent() const { return m_pParent; } uint32_t CountAttrs() const { return m_AttrMap.GetSize(); } void GetAttrByIndex(int index, - CFX_ByteString& space, - CFX_ByteString& name, - CFX_WideString& value) const; + CFX_ByteString* space, + CFX_ByteString* name, + CFX_WideString* value) const; bool HasAttr(const CFX_ByteStringC& qName) const; bool GetAttrValue(const CFX_ByteStringC& name, CFX_WideString& attribute) const; -- cgit v1.2.3