walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'master' into project

This commit is contained in:
Daniel Marjamäki 2016-08-07 15:47:41 +02:00
parent 78fc307c73 c2ae976412
commit f45dc345a9
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cli/cmdlineparser.cpp
View File

@ -751,11 +751,13 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])
PrintMessage("cppcheck: unusedFunction check can't be used with '-j' option. Disabling unusedFunction check."); PrintMessage("cppcheck: unusedFunction check can't be used with '-j' option. Disabling unusedFunction check.");
} }
if (_settings->xml) {
// Warn about XML format 1, which will be removed in cppcheck 1.81 // Warn about XML format 1, which will be removed in cppcheck 1.81
if (_settings->xml_version == 1U) if (_settings->xml_version == 1U)
PrintMessage("cppcheck: XML format version 1 is deprecated and will be removed in cppcheck 1.81. Use '--xml-version=2'."); PrintMessage("cppcheck: XML format version 1 is deprecated and will be removed in cppcheck 1.81. Use '--xml-version=2'.");
if (_settings->inconclusive && _settings->xml && _settings->xml_version == 1U) if (_settings->inconclusive && _settings->xml_version == 1U)
PrintMessage("cppcheck: inconclusive messages will not be shown, because the old xml format is not compatible."); PrintMessage("cppcheck: inconclusive messages will not be shown, because the old xml format is not compatible.");
}
if (argc <= 1) { if (argc <= 1) {
_showHelp = true; _showHelp = true;

5
htmlreport/check.sh
View File

@ -17,11 +17,6 @@ xmllint --noout gui_test.xml
echo -e "\n" echo -e "\n"
../cppcheck --errorlist > errorlist.xml
xmllint --noout errorlist.xml
./cppcheck-htmlreport --file ./errorlist.xml --title "errorlist" --report-dir .
echo ""
../cppcheck --errorlist --inconclusive --xml-version=2 > errorlist.xml ../cppcheck --errorlist --inconclusive --xml-version=2 > errorlist.xml
xmllint --noout errorlist.xml xmllint --noout errorlist.xml
./cppcheck-htmlreport --file ./errorlist.xml --title "errorlist" --report-dir . ./cppcheck-htmlreport --file ./errorlist.xml --title "errorlist" --report-dir .