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

Cleanup first_element_by_path

Browse Source 
Instead of performing a late null check that is redundant and only
needed to silence clang static analysis warning, we pick the context as
a root / self node. This way the code is a bit less redundant and the
static analyzer is happy.
This commit is contained in:
Arseny Kapoulkine 2019-12-03 21:23:15 -08:00
parent 2e8631d2eb
commit 53a30c6571
1 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/pugixml.cpp
View File

@ -6233,16 +6233,9 @@ namespace pugi
PUGI__FN xml_node xml_node::first_element_by_path(const char_t* path_, char_t delimiter) const PUGI__FN xml_node xml_node::first_element_by_path(const char_t* path_, char_t delimiter) const
{ {
xml_node found = *this; // Current search context. xml_node context = path_[0] == delimiter ? root() : *this;
if (!_root || !path_[0]) return found; if (!context._root) return xml_node();
if (path_[0] == delimiter)
{
// Absolute path; e.g. '/foo/bar'
found = found.root();
++path_;
}
const char_t* path_segment = path_; const char_t* path_segment = path_;
@ -6252,29 +6245,27 @@ namespace pugi
while (*path_segment_end && *path_segment_end != delimiter) ++path_segment_end; while (*path_segment_end && *path_segment_end != delimiter) ++path_segment_end;
if (path_segment == path_segment_end) return found; if (path_segment == path_segment_end) return context;
const char_t* next_segment = path_segment_end; const char_t* next_segment = path_segment_end;
while (*next_segment == delimiter) ++next_segment; while (*next_segment == delimiter) ++next_segment;
if (*path_segment == '.' && path_segment + 1 == path_segment_end) if (*path_segment == '.' && path_segment + 1 == path_segment_end)
return found.first_element_by_path(next_segment, delimiter); return context.first_element_by_path(next_segment, delimiter);
else if (*path_segment == '.' && *(path_segment+1) == '.' && path_segment + 2 == path_segment_end) else if (*path_segment == '.' && *(path_segment+1) == '.' && path_segment + 2 == path_segment_end)
return found.parent().first_element_by_path(next_segment, delimiter); return context.parent().first_element_by_path(next_segment, delimiter);
else else
{ {
if (found._root) { for (xml_node_struct* j = context._root->first_child; j; j = j->next_sibling)
for (xml_node_struct* j = found._root->first_child; j; j = j->next_sibling) {
{ if (j->name && impl::strequalrange(j->name, path_segment, static_cast<size_t>(path_segment_end - path_segment)))
if (j->name && impl::strequalrange(j->name, path_segment, static_cast<size_t>(path_segment_end - path_segment))) {
{ xml_node subsearch = xml_node(j).first_element_by_path(next_segment, delimiter);
xml_node subsearch = xml_node(j).first_element_by_path(next_segment, delimiter);
if (subsearch) return subsearch; if (subsearch) return subsearch;
} }
} }
}
return xml_node(); return xml_node();
} }