External/pugixml
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use impl::get_document instead of root() where possible

Browse Source 
This reduces the number of unsafe pointer manipulations.
This commit is contained in:
Arseny Kapoulkine 2014-11-05 09:18:06 +01:00
parent 2cb5d40956
commit ab12b30c83
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/pugixml.cpp
View File

@ -4792,11 +4792,7 @@ namespace pugi
PUGI__FN xml_node xml_node::root() const PUGI__FN xml_node xml_node::root() const
{ {
if (!_root) return xml_node(); return _root ? xml_node(&impl::get_document(_root)) : xml_node();
impl::xml_memory_page* page = reinterpret_cast<impl::xml_memory_page*>(_root->header & impl::xml_memory_page_pointer_mask);
return xml_node(static_cast<impl::xml_document_struct*>(page->allocator));
} }
PUGI__FN xml_text xml_node::text() const PUGI__FN xml_text xml_node::text() const
@ -5191,8 +5187,7 @@ namespace pugi
if (!impl::allow_insert_child(type(), node_element)) return impl::make_parse_result(status_append_invalid_root); if (!impl::allow_insert_child(type(), node_element)) return impl::make_parse_result(status_append_invalid_root);
// get document node // get document node
impl::xml_document_struct* doc = static_cast<impl::xml_document_struct*>(root()._root); impl::xml_document_struct* doc = &impl::get_document(_root);
assert(doc);
// disable document_buffer_order optimization since in a document with multiple buffers comparing buffer pointers does not make sense // disable document_buffer_order optimization since in a document with multiple buffers comparing buffer pointers does not make sense
doc->header |= impl::xml_memory_page_contents_shared_mask; doc->header |= impl::xml_memory_page_contents_shared_mask;
@ -5403,12 +5398,11 @@ namespace pugi
PUGI__FN ptrdiff_t xml_node::offset_debug() const PUGI__FN ptrdiff_t xml_node::offset_debug() const
{ {
xml_node_struct* r = root()._root; if (!_root) return -1;
if (!r) return -1; impl::xml_document_struct& doc = impl::get_document(_root);
const char_t* buffer = static_cast<impl::xml_document_struct*>(r)->buffer;
const char_t* buffer = doc.buffer;
if (!buffer) return -1; if (!buffer) return -1;
switch (type()) switch (type())