From 300a05d6c6b578713c4b73509d0961d39d695bcd Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Tue, 5 Feb 2013 20:57:49 +0000 Subject: [PATCH] Remove CPPCheck suppressions for unused functions, disable checking for them in the StaticAnalysisTest build test as it can't cope with GCC aliasing and mixed library/application code. --- BuildTests/StaticAnalysisTest/makefile | 2 ++ LUFA.pnproj | 2 +- LUFA/Drivers/USB/Class/Device/AudioClassDevice.c | 1 - LUFA/Drivers/USB/Class/Device/CDCClassDevice.c | 1 - LUFA/Drivers/USB/Class/Host/CDCClassHost.c | 1 - LUFA/Drivers/USB/Core/Events.c | 1 - LUFA/StudioIntegration/lufa_drivers_board.xml | 6 +++--- Projects/Webserver/Lib/uIPManagement.c | 1 - 8 files changed, 6 insertions(+), 9 deletions(-) diff --git a/BuildTests/StaticAnalysisTest/makefile b/BuildTests/StaticAnalysisTest/makefile index 4e166ed2df..453d886671 100644 --- a/BuildTests/StaticAnalysisTest/makefile +++ b/BuildTests/StaticAnalysisTest/makefile @@ -20,6 +20,8 @@ CPPCHECK_INCLUDES := $(patsubst %/,%,$(LUFA_PATH))/CodeTemplates/ CPPCHECK_FLAGS := -U TEMPLATE_FUNC_NAME -U __GNUC__ -U __DOXYGEN__ +CPPCHECK_SUPPRESS := variableScope missingInclude unusedFunction + SRC := $(patsubst %/,%,$(LUFA_PATH))/.. # Build test cannot be run with multiple parallel jobs diff --git a/LUFA.pnproj b/LUFA.pnproj index 75d427506c..4352398676 100644 --- a/LUFA.pnproj +++ b/LUFA.pnproj @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c b/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c index 6c0606e645..49a71b06fc 100644 --- a/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c +++ b/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c @@ -188,7 +188,6 @@ bool Audio_Device_ConfigureEndpoints(USB_ClassInfo_Audio_Device_t* const AudioIn return true; } -// cppcheck-suppress unusedFunction void Audio_Device_Event_Stub(void) { diff --git a/LUFA/Drivers/USB/Class/Device/CDCClassDevice.c b/LUFA/Drivers/USB/Class/Device/CDCClassDevice.c index 2ee84d94d6..f9b9a12a10 100644 --- a/LUFA/Drivers/USB/Class/Device/CDCClassDevice.c +++ b/LUFA/Drivers/USB/Class/Device/CDCClassDevice.c @@ -332,7 +332,6 @@ static int CDC_Device_getchar_Blocking(FILE* Stream) } #endif -// cppcheck-suppress unusedFunction void CDC_Device_Event_Stub(void) { diff --git a/LUFA/Drivers/USB/Class/Host/CDCClassHost.c b/LUFA/Drivers/USB/Class/Host/CDCClassHost.c index ea8cb84b04..2bf9943f4d 100644 --- a/LUFA/Drivers/USB/Class/Host/CDCClassHost.c +++ b/LUFA/Drivers/USB/Class/Host/CDCClassHost.c @@ -468,7 +468,6 @@ static int CDC_Host_getchar_Blocking(FILE* Stream) } #endif -// cppcheck-suppress unusedFunction void CDC_Host_Event_Stub(void) { diff --git a/LUFA/Drivers/USB/Core/Events.c b/LUFA/Drivers/USB/Core/Events.c index 6f15bc8985..535233a26d 100644 --- a/LUFA/Drivers/USB/Core/Events.c +++ b/LUFA/Drivers/USB/Core/Events.c @@ -32,7 +32,6 @@ #define __INCLUDE_FROM_USB_DRIVER #include "Events.h" -// cppcheck-suppress unusedFunction void USB_Event_Stub(void) { diff --git a/LUFA/StudioIntegration/lufa_drivers_board.xml b/LUFA/StudioIntegration/lufa_drivers_board.xml index 8c5cef5b2e..3677d20036 100644 --- a/LUFA/StudioIntegration/lufa_drivers_board.xml +++ b/LUFA/StudioIntegration/lufa_drivers_board.xml @@ -11,21 +11,21 @@ - + - + - + diff --git a/Projects/Webserver/Lib/uIPManagement.c b/Projects/Webserver/Lib/uIPManagement.c index af83262f6a..d89b787785 100644 --- a/Projects/Webserver/Lib/uIPManagement.c +++ b/Projects/Webserver/Lib/uIPManagement.c @@ -189,7 +189,6 @@ static void uIPManagement_ProcessIncomingPacket(void) } /* If the packet contains an Ethernet frame, process it */ - // cppcheck-suppress redundantOperationIn if (uip_len > 0) { switch (((struct uip_eth_hdr*)uip_buf)->type)