[checkmk-commits] Make recent cppcheck versions happy.

Module: check_mk Branch: master Commit: 8c7a2aad1ae944f2a73036b265bb345f14eb36ea URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c7a2aad1ae944… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Apr 24 12:48:17 2017 +0200 Make recent cppcheck versions happy. The "unusedFunction" checks seems to be even more seriously broken than in previous versions, so let's disable it, it's not that helpful, anyway. Change-Id: I1a3e14ca498e7e81748bbb44f3a8a342b7a96d5c --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 4903e0e..f1a07b3 100644 --- a/Makefile +++ b/Makefile @@ -516,12 +516,12 @@ cppcheck: compile_commands.json @scripts/compiled_sources | \ grep /livestatus/src/ |\ sed 's/^"\(.*\)"$$/\1/' | \ - ( cd livestatus && $(CPPCHECK) -DHAVE_CONFIG_H -UCMC --enable=all --suppress=missingIncludeSystem --inline-suppr -I src -I .. -I . --file-list=- --quiet --template=gcc ) + ( cd livestatus && $(CPPCHECK) -DHAVE_CONFIG_H -UCMC --enable=all --suppress=missingIncludeSystem --suppress=unusedFunction --inline-suppr -I src -I .. -I . --file-list=- --quiet --template=gcc ) ifeq ($(ENTERPRISE),yes) @scripts/compiled_sources | \ grep /enterprise/core/ |\ sed 's/^"\(.*\)"$$/\1/' | \ - ( cd enterprise/core/src && $(CPPCHECK) -DHAVE_CONFIG_H -DCMC --enable=all --suppress=missingIncludeSystem --inline-suppr -I . -I ../../.. -I livestatus -I checkhelper --file-list=- --quiet --template=gcc ) + ( cd enterprise/core/src && $(CPPCHECK) -DHAVE_CONFIG_H -DCMC --enable=all --suppress=missingIncludeSystem --suppress=unusedFunction --inline-suppr -I . -I ../../.. -I livestatus -I checkhelper --file-list=- --quiet --template=gcc ) endif # XML output into file intended for machine processing. @@ -529,12 +529,12 @@ cppcheck-xml: compile_commands.json scripts/compiled_sources | \ grep /livestatus/src/ |\ sed 's/^"\(.*\)"$$/\1/' | \ - ( cd livestatus && $(CPPCHECK) -DHAVE_CONFIG_H -UCMC --enable=all --suppress=missingIncludeSystem --inline-suppr -I src -I .. -I . --file-list=- --quiet --template=gcc --xml --xml-version=2 2> cppcheck-result.xml ) + ( cd livestatus && $(CPPCHECK) -DHAVE_CONFIG_H -UCMC --enable=all --suppress=missingIncludeSystem --suppress=unusedFunction --inline-suppr -I src -I .. -I . --file-list=- --quiet --template=gcc --xml --xml-version=2 2> cppcheck-result.xml ) ifeq ($(ENTERPRISE),yes) scripts/compiled_sources | \ grep /enterprise/core/ |\ sed 's/^"\(.*\)"$$/\1/' | \ - ( cd enterprise/core/src && $(CPPCHECK) -DHAVE_CONFIG_H -DCMC --enable=all --suppress=missingIncludeSystem --inline-suppr -I . -I ../../.. -I livestatus -I checkhelper --file-list=- --quiet --template=gcc --xml --xml-version=2 2> cppcheck-result.xml ) + ( cd enterprise/core/src && $(CPPCHECK) -DHAVE_CONFIG_H -DCMC --enable=all --suppress=missingIncludeSystem --suppress=unusedFunction --inline-suppr -I . -I ../../.. -I livestatus -I checkhelper --file-list=- --quiet --template=gcc --xml --xml-version=2 2> cppcheck-result.xml ) endif # TODO: We should probably handle this rule via AM_EXTRA_RECURSIVE_TARGETS in