summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Szyndela <adrian.s@samsung.com>2020-04-09 10:01:48 +0200
committerAdrian Szyndela <adrian.s@samsung.com>2020-04-09 10:53:58 +0200
commit0821d6ca80fe71fdc251580c56cbe4595f6a84f3 (patch)
treeb7b4f674e46adb33d2a994889854c73a1e3546b5
parent0a3ba72cc2532650afe3485b0a2b77739faefcec (diff)
downloadlibdbuspolicy-0821d6ca80fe71fdc251580c56cbe4595f6a84f3.tar.gz
libdbuspolicy-0821d6ca80fe71fdc251580c56cbe4595f6a84f3.tar.bz2
libdbuspolicy-0821d6ca80fe71fdc251580c56cbe4595f6a84f3.zip
xml-parser: don't clear list of included files in each dir
The 'includedir' directives should make the parser include all the files in the directories introduced with the directives. This commit removes clearing of the gathered file list when the directive is encountered. Change-Id: Id14be322e8696bd85ddfbb0ba2360a7b4b5bcda4
-rw-r--r--src/internal/xml_parser.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/internal/xml_parser.cpp b/src/internal/xml_parser.cpp
index dba29ff..4bcbb1d 100644
--- a/src/internal/xml_parser.cpp
+++ b/src/internal/xml_parser.cpp
@@ -284,7 +284,7 @@ void XmlParser::getIncludedFiles(const std::string& parent_dir, const std::strin
DIR *dir;
struct dirent *ent;
const std::string dname = expandPath(parent_dir, incldir);
- files.clear();
+
if ((dir = opendir(dname.c_str())) != NULL) {
while ((ent = readdir(dir)) != NULL) {
std::string s(ent->d_name);