Fix issues after CPPcheck 1.88 update (#1308)

Author: tekka007

.ci/static_analysis.groovy

@@ -5,7 +5,7 @@ def cppCheck(config) {
 	sh """#!/bin/bash +x
 				cd ${config.repository_root}
 				echo "Doing cppcheck for AVR..."
-				find . -type f \\( -iname \\*.c -o -iname \\*.cpp -o -iname \\*.ino \\) | cppcheck -j 4 --force --file-list=- --enable=style,information --platform=.mystools/cppcheck/config/avr.xml --suppressions-list=.mystools/cppcheck/config/suppressions.cfg --includes-file=.mystools/cppcheck/config/includes.cfg --language=c++ --inline-suppr --xml --xml-version=2 2> cppcheck-avr.xml
+				find . -type f \\( -iname \\*.c -o -iname \\*.cpp -o -iname \\*.ino \\) | cppcheck -j 4 --force --file-list=- --enable=style,portability,performance --platform=.mystools/cppcheck/config/avr.xml --suppressions-list=.mystools/cppcheck/config/suppressions.cfg --includes-file=.mystools/cppcheck/config/includes.cfg --language=c++ --inline-suppr --xml --xml-version=2 2> cppcheck-avr.xml
 				cppcheck-htmlreport --file="cppcheck-avr.xml" --title="cppcheck-avr" --report-dir=cppcheck-avr_cppcheck_reports --source-dir=."""
 
 	publishHTML([allowMissing: false, alwaysLinkToLastBuild: false, keepAll: true,

.mystools/bootstrap-dev.sh

@@ -18,11 +18,12 @@ check_tool_prerequisite()
 	function ver { printf "%03d%03d%03d%03d" $(echo "$1" | tr '.' ' '); }
 
 	if is_installed ${1} ; then
-		#local version=$(${1} --version 2>&1 | sed -e 's/[[:alpha:]|(|[:space:]]//g')
-		local version=$(${1} --version 2>&1 | sed -ne 's/[^0-9]*\(\([0-9]\.\)\{0,4\}[0-9][^.]\).*/\1/p')
+		local version=$(${1} --version 2>&1 | sed -nre 's/^[^0-9]*(([0-9]+\.)*[0-9]+).*/\1/p')
 		if [ $(ver ${version}) -lt $(ver ${2}) ]; then
 			warn "Found ${1} ${version} however, version ${2} or greater is required..."
 			return 1
+		else
+			log "Found ${1} ${version}"
 		fi
 	else
 		warn "${1} not installed or not in current path."
@@ -73,8 +74,8 @@ check_git_remote "upstream" "${mysrepo}" || {
 
 #3
 log "Checking tool/utility prerequisites..."
-check_tool_prerequisite "astyle" "2.0.5"   || err "Install AStyle 2.0.5 or greater and re-run ${0}"
-check_tool_prerequisite "cppcheck" "1.76" || err "Install Cppcheck 1.76 or greater and re-run ${0}"
+check_tool_prerequisite "astyle" "3.1"   || err "Install AStyle 3.1 or greater and re-run ${0}"
+check_tool_prerequisite "cppcheck" "1.88" || err "Install Cppcheck 1.88 or greater and re-run ${0}"
 check_tool_prerequisite "git" "2.0" || err "Install git 2.0 or greater and re-run ${0}"
 
 #4

.mystools/cppcheck/config/includes.cfg

@@ -1,5 +0,0 @@
-.
-hal/architecture/Linux/drivers/core
-hal/architecture/Linux/drivers/BCM
-hal/crypto/generic/drivers/AES
-core

.mystools/cppcheck/config/suppressions.cfg

@@ -1,4 +1,13 @@
-ConfigurationNotChecked
-unmatchedSuppression
-// This suppression is because the problem is in an in-lined macro so in-line-suppressions does not appear to take effect
-unreadVariable:*/MyHwNRF5.cpp
+// inline suppression doesn't work
+*:hal/architecture/NRF5/drivers/Flash.cpp
+*:drivers/NVM/NVRAM.cpp
+*:hal\transport\RFM69\driver\old\RFM69_old.cpp
+// 3rd party
+*:hal/architecture/Linux/drivers/BCM/bcm2835.c
+*:hal/architecture/Linux/drivers/core/Client.h
+*:hal/architecture/Linux/drivers/core/EthernetClient.cpp
+*:hal/architecture/Linux/drivers/core/EthernetClient.h
+*:hal/architecture/Linux/drivers/core/EthernetServer.cpp
+*:hal/architecture/Linux/drivers/core/EthernetServer.h
+*:hal/architecture/Linux/drivers/core/SerialPort.h
+*:hal/architecture/Linux/drivers/core/StdInOutStream.h

.mystools/cppcheck/config/unix32.xml

@@ -1,15 +1,15 @@
 #!/bin/bash
 
-OPTIONS="--quiet                                      \
-	--error-exitcode=1                                  \
-	--force                                             \
-	--enable=style,information                          \
-	-DCPPCHECK                                          \
-	--language=c++                                      \
-	--library=${LIBRARY:-avr}                           \
-	--platform="${TOOLCONFIG}"/${PLATFORM:-avr.xml}     \
+OPTIONS="--quiet                                          \
+	--error-exitcode=1                                    \
+	--force                                               \
+     --enable=style,portability,performance               \
+	-DCPPCHECK                                            \
+	--language=c++                                        \
+	--library=${LIBRARY:-avr}                             \
+	--platform="${TOOLCONFIG}"/${PLATFORM:-avr.xml}       \
  	--includes-file="${TOOLCONFIG}"/includes.cfg	      \
- 	--inline-suppr                                      \
+ 	--inline-suppr                                        \
 	--suppressions-list="${TOOLCONFIG}"/suppressions.cfg"
 
 echo $OPTIONS

.mystools/cppcheck/options.sh

@@ -1553,7 +1553,56 @@
 /** @}*/ // End of GatewaySettingGrpPub group
 
 /**
- * @defgroup lEDSettingGrpPub LED
+ * @defgroup GSMSettingGrpPub GSM
+ * @ingroup MyConfigGrp
+ * @brief These options control GSM specific configurations.
+ * @{
+ */
+/**
+ * @def MY_GSM_APN
+ * @brief APN from your cell carrier / mobile provider. Example: 4g.tele2.se
+ */
+//#define MY_GSM_APN
+/**
+* @def MY_GSM_BAUDRATE
+* @brief Baudrate for your GSM modem. If left undefined, TinyGSM will try to auto detect the correct rate
+*/
+//#define MY_GSM_BAUDRATE (9600u)
+/**
+* @def MY_GSM_PIN
+* @brief PIN code for your SIM card, if PIN lock is active.
+*/
+//#define MY_GSM_PIN
+/**
+* @def MY_GSM_PSW
+* @brief If using a GSM modem, this is the password supplied by your cell carrier / mobile provider. If using ESP8266 as a WiFi modem, this is your WiFi network password
+*/
+//#define MY_GSM_PSW
+/**
+* @def MY_GSM_RX
+* @brief If defined, uses softSerial using defined pins (must also define MY_GSM_TX)
+*/
+//#define MY_GSM_RX
+/**
+* @def MY_GSM_SSID
+* @brief If using ESP8266 as WiFi modem, this is your network SSID
+*/
+//#define MY_GSM_SSID
+/**
+* @def MY_GSM_TX
+* @brief If defined, uses softSerial using defined pins (must also define MY_GSM_RX)
+*/
+//#define MY_GSM_TX
+/**
+* @def MY_GSM_USR
+* @brief Supplied by your cell carrier / mobile operator. If not required, leave undefined.
+*/
+//#define MY_GSM_USR
+
+/** @}*/ // End of GSMSettingGrpPub group
+
+/**
+ * @defgroup LEDSettingGrpPub LED
  * @ingroup MyConfigGrp
  * @brief These options control LED specific configurations.
  * @{
@@ -2238,47 +2287,14 @@
 #define MY_CONTROLLER_IP_ADDRESS
 #define MY_CONTROLLER_URL_ADDRESS
 // TinyGSM
-/**
- * @def MY_GSM_APN
- * @brief APN from your cell carrier / mobile provider. Example: 4g.tele2.se
- */
 #define MY_GSM_APN
-/**
- * @def MY_GSM_BAUDRATE
- * @brief Baudrate for your GSM modem. If left undefined, TinyGSM will try to auto detect the correct rate
- */
 #define MY_GSM_BAUDRATE
-/**
- * @def MY_GSM_PIN
- * @brief PIN code for your SIM card, if PIN lock is active.
- */
 #define MY_GSM_PIN
-/**
- * @def MY_GSM_PSW
- * @brief If using a GSM modem, this is the password supplied by your cell carrier / mobile provider. If using ESP8266 as a WiFi modem, this is your WiFi network password
- */
 #define MY_GSM_PSW
-/**
- * @def MY_GSM_RX
- * @brief If defined, uses softSerial using defined pins (must also define MY_GSM_TX)
- */
 #define MY_GSM_RX
-/**
- * @def MY_GSM_SSID
- * @brief If using ESP8266 as WiFi modem, this is your network SSID
- */
 #define MY_GSM_SSID
-/**
- * @def MY_GSM_TX
- * @brief If defined, uses softSerial using defined pins (must also define MY_GSM_RX)
- */
 #define MY_GSM_TX
-/**
- * @def MY_GSM_USR
- * @brief Supplied by your cell carrier / mobile operator. If not required, leave undefined.
- */
 #define MY_GSM_USR
-
 // LED
 #define MY_DEFAULT_ERR_LED_PIN
 #define MY_DEFAULT_TX_LED_PIN

MyConfig.h

@@ -248,7 +248,7 @@ bool gatewayTransportInit(void)
 bool gatewayTransportSend(MyMessage &message)
 {
 	int nbytes = 0;
-	char *_ethernetMsg = protocolMyMessage2Serial(message);
+	char *_ethernetMessage = protocolMyMessage2Serial(message);
 
 	setIndication(INDICATION_GW_TX);
 
@@ -260,7 +260,7 @@ bool gatewayTransportSend(MyMessage &message)
 #else
 	_ethernetServer.beginPacket(_ethernetControllerIP, MY_PORT);
 #endif /* End of MY_CONTROLLER_URL_ADDRESS */
-	_ethernetServer.write((uint8_t *)_ethernetMsg, strlen(_ethernetMsg));
+	_ethernetServer.write((uint8_t *)_ethernetMessage, strlen(_ethernetMessage));
 	// returns 1 if the packet was sent successfully
 	nbytes = _ethernetServer.endPacket();
 #else /* Else part of MY_USE_UDP */
@@ -283,18 +283,18 @@ bool gatewayTransportSend(MyMessage &message)
 			return false;
 		}
 	}
-	nbytes = client.write((const uint8_t*)_ethernetMsg, strlen(_ethernetMsg));
+	nbytes = client.write((const uint8_t *)_ethernetMessage, strlen(_ethernetMessage));
 #endif /* End of MY_USE_UDP */
 #else /* Else part of MY_GATEWAY_CLIENT_MODE */
 	// Send message to connected clients
 #if defined(MY_GATEWAY_ESP8266) || defined(MY_GATEWAY_ESP32)
 	for (uint8_t i = 0; i < ARRAY_SIZE(clients); i++) {
 		if (clients[i] && clients[i].connected()) {
-			nbytes += clients[i].write((uint8_t *)_ethernetMsg, strlen(_ethernetMsg));
+			nbytes += clients[i].write((uint8_t *)_ethernetMessage, strlen(_ethernetMessage));
 		}
 	}
 #else /* Else part of MY_GATEWAY_ESPxx*/
-	nbytes = _ethernetServer.write(_ethernetMsg);
+	nbytes = _ethernetServer.write(_ethernetMessage);
 #endif /* End of MY_GATEWAY_ESPxx */
 #endif /* End of MY_GATEWAY_CLIENT_MODE */
 	_w5100_spi_en(false);

core/MyGatewayTransportEthernet.cpp

@@ -141,13 +141,13 @@ LOCAL bool firmwareOTAUpdateProcess(void)
 #ifdef MCUBOOT_PRESENT
 		if (_msg.type == ST_FIRMWARE_CONFIRM) {
 			if (*(uint16_t *)MCUBOOT_IMAGE_0_MAGIC_ADDR == ((uint16_t)MCUBOOT_IMAGE_MAGIC)) {
-				if (*(uint8_t*)(MCUBOOT_IMAGE_0_IMG_OK_ADDR)!=MCUBOOT_IMAGE_0_IMG_OK_BYTE) {
+				if (*(uint8_t *)(MCUBOOT_IMAGE_0_IMG_OK_ADDR) != MCUBOOT_IMAGE_0_IMG_OK_BYTE) {
 					// Calculate data word to write
-					uint32_t *img_ok_base_addr = (uint32_t*)(MCUBOOT_IMAGE_0_IMG_OK_ADDR & ~3); // align word wise
+					uint32_t *img_ok_base_addr = (uint32_t *)(MCUBOOT_IMAGE_0_IMG_OK_ADDR & ~3); // align word wise
 					uint32_t img_ok_data = *img_ok_base_addr;
 					// Set copy of MCUBOOT_IMAGE_0_IMG_OK_ADDR to MCUBOOT_IMAGE_0_IMG_OK_BYTE (0x01)
-					uint8_t * img_ok_array = (uint8_t*)(&img_ok_data);
-					img_ok_array[MCUBOOT_IMAGE_0_IMG_OK_ADDR % 4] = MCUBOOT_IMAGE_0_IMG_OK_BYTE;
+					uint8_t *img_ok_array = (uint8_t *)&img_ok_data;
+					*(img_ok_array + (MCUBOOT_IMAGE_0_IMG_OK_ADDR % 4)) = MCUBOOT_IMAGE_0_IMG_OK_BYTE;
 					// Write word back
 					Flash.write(img_ok_base_addr, img_ok_data);
 				}

core/MyOTAFirmwareUpdate.cpp

@@ -195,8 +195,8 @@ bool signerCheckTimer(void)
 
 bool signerSignMsg(MyMessage &msg)
 {
-	bool ret;
 #if defined(MY_SIGNING_FEATURE)
+	bool ret;
 	// If destination is known to require signed messages and we are the sender,
 	// sign this message unless it is identified as an exception
 	if (DO_SIGN(msg.destination) && msg.sender == getNodeId()) {
@@ -255,11 +255,12 @@ bool signerSignMsg(MyMessage &msg)
 		           getNodeId()); // Will not sign message since it was from someone else
 		ret = true;
 	}
+	return ret;
 #else
 	(void)msg;
-	ret = true;
+	return true;
 #endif // MY_SIGNING_FEATURE
-	return ret;
+
 }
 
 bool signerVerifyMsg(MyMessage &msg)