summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-06-28 21:57:30 +0300
committerAndrei Karas <akaras@inbox.ru>2017-06-28 21:57:30 +0300
commit4c4d59b85e3b89812cede60dea8cf0d0185695ae (patch)
treea0099c67200830cdee5026c639a6766e0cfc56f3
parentc3f8a2808ea38f8ebd05408c19d2fafedcdd126b (diff)
downloadmv-4c4d59b85e3b89812cede60dea8cf0d0185695ae.tar.gz
mv-4c4d59b85e3b89812cede60dea8cf0d0185695ae.tar.bz2
mv-4c4d59b85e3b89812cede60dea8cf0d0185695ae.tar.xz
mv-4c4d59b85e3b89812cede60dea8cf0d0185695ae.zip
Hide xml errors if flag allow to hide it.
-rw-r--r--src/utils/xml/libxml.cpp5
-rw-r--r--src/utils/xml/pugixml.cpp2
-rw-r--r--src/utils/xml/tinyxml2.cpp2
3 files changed, 5 insertions, 4 deletions
diff --git a/src/utils/xml/libxml.cpp b/src/utils/xml/libxml.cpp
index 840c28edd..ea15cb6bb 100644
--- a/src/utils/xml/libxml.cpp
+++ b/src/utils/xml/libxml.cpp
@@ -125,9 +125,10 @@ namespace XML
}
file.close();
}
- else
+ else if (skipError == SkipError_false)
{
- reportAlways("Error loading XML file %s", filename.c_str());
+ reportAlways("Error loading XML file %s",
+ filename.c_str());
}
}
diff --git a/src/utils/xml/pugixml.cpp b/src/utils/xml/pugixml.cpp
index 0c9e2bee9..bf94c3443 100644
--- a/src/utils/xml/pugixml.cpp
+++ b/src/utils/xml/pugixml.cpp
@@ -103,7 +103,7 @@ namespace XML
}
file.close();
}
- else
+ else if (skipError == SkipError_false)
{
reportAlways("Error loading XML file %s",
filename.c_str());
diff --git a/src/utils/xml/tinyxml2.cpp b/src/utils/xml/tinyxml2.cpp
index 60e9070d9..c68059399 100644
--- a/src/utils/xml/tinyxml2.cpp
+++ b/src/utils/xml/tinyxml2.cpp
@@ -95,7 +95,7 @@ namespace XML
}
file.close();
}
- else
+ else if (skipError == SkipError_false)
{
reportAlways("Error loading XML file %s",
filename.c_str());