Address various MISRA warnings v2 (#238)

* Address some MISRA warnings

* Change the return type

* Update FreeRTOS_Sockets.c

5 files changed, 20 insertions, 14 deletions

diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/FreeRTOS_DNS.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/FreeRTOS_DNS.c
index 03de2f86f..5065f903d 100644
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/FreeRTOS_DNS.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/FreeRTOS_DNS.c
@@ -1252,10 +1252,16 @@ BaseType_t xReturn = pdTRUE;
 			const uint16_t usCount = ( uint16_t ) ipconfigDNS_CACHE_ADDRESSES_PER_ENTRY;
 			uint16_t usNumARecordsStored = 0;
 	
-				for( x = 0U; ( x < pxDNSMessageHeader->usAnswers ) && ( usNumARecordsStored < usCount ); x++ )
+				for( x = 0U; x < pxDNSMessageHeader->usAnswers; x++ )
 				{
 				BaseType_t xDoAccept;
 	
+					if( usNumARecordsStored >= usCount )
+					{
+						/* Only count ipconfigDNS_CACHE_ADDRESSES_PER_ENTRY number of records. */
+						break;
+					}
+
 					uxResult = prvSkipNameField( pucByte,
 												 uxSourceBytesRemaining );
 	
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/FreeRTOS_Sockets.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/FreeRTOS_Sockets.c
index 9ed2c4120..c8160821a 100644
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/FreeRTOS_Sockets.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/FreeRTOS_Sockets.c
@@ -1883,7 +1883,7 @@ const socklen_t uxSize = 16;
 	{
 	uint8_t pucDigits[ sockDIGIT_COUNT ];
 	uint8_t ucValue = pucAddress[ uxNibble ];
-	socklen_t uxSource = sockDIGIT_COUNT - 1U;
+	socklen_t uxSource = ( socklen_t ) sockDIGIT_COUNT - ( socklen_t ) 1U;
 	socklen_t uxNeeded;
 
 		for( ;; )
@@ -1899,7 +1899,7 @@ const socklen_t uxSize = 16;
 		pucDigits[ 0 ] = ucValue;
 
 		/* Skip leading zeros. */
-		for( uxSource = 0; uxSource < ( socklen_t ) ( sockDIGIT_COUNT - 1U ); uxSource++ )
+		for( uxSource = 0; uxSource < ( ( socklen_t ) sockDIGIT_COUNT - ( socklen_t ) 1U ); uxSource++ )
 		{
 			if( pucDigits[ uxSource ] != 0U )
 			{
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_IP.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_IP.h
index 7b37f955e..1604f63c8 100644
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_IP.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_IP.h
@@ -313,11 +313,16 @@ BaseType_t FreeRTOS_IsNetworkUp( void );
  * Socket has had activity, reset the timer so it will not be closed
  * because of inactivity
  */
-const char *FreeRTOS_GetTCPStateName( UBaseType_t ulState);
+#if( ( ipconfigHAS_DEBUG_PRINTF != 0 ) || ( ipconfigHAS_PRINTF != 0 ) )
+	const char *FreeRTOS_GetTCPStateName( UBaseType_t ulState);
+#endif
 
 /* _HT_ Temporary: show all valid ARP entries
  */
-void FreeRTOS_PrintARPCache( void );
+#if( ipconfigHAS_PRINTF != 0 ) || ( ipconfigHAS_DEBUG_PRINTF != 0 )
+	void FreeRTOS_PrintARPCache( void );
+#endif
+
 void FreeRTOS_ClearARP( void );
 
 /* Return pdTRUE if the IPv4 address is a multicast address. */
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_IP_Private.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_IP_Private.h
index 3e002abf0..33b0d7c22 100644
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_IP_Private.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_IP_Private.h
@@ -516,13 +516,6 @@ socket events. */
 #endif
 
 /*
- * A version of FreeRTOS_GetReleaseNetworkBuffer() that can be called from an
- * interrupt.  If a non zero value is returned, then the calling ISR should
- * perform a context switch before exiting the ISR.
- */
-BaseType_t FreeRTOS_ReleaseFreeNetworkBufferFromISR( void );
-
-/*
  * Create a message that contains a command to initialise the network interface.
  * This is used during initialisation, and at any time the network interface
  * goes down thereafter.  The network interface hardware driver is responsible
@@ -585,7 +578,9 @@ BaseType_t xIPIsNetworkTaskReady( void );
 	 * Actually a user thing, but because xBoundTCPSocketsList, let it do by the
 	 * IP-task
 	 */
-	void vTCPNetStat( void );
+	#if( ipconfigHAS_PRINTF != 0 )
+		void vTCPNetStat( void );
+	#endif
 
 	/*
 	 * At least one socket needs to check for timeouts
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_Sockets.h b/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_Sockets.h
index 0ff55d17a..5ad2555b5 100644
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_Sockets.h
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-TCP/include/FreeRTOS_Sockets.h
@@ -205,7 +205,7 @@ struct xSOCKET;
 typedef struct xSOCKET *Socket_t;
 typedef struct xSOCKET const * ConstSocket_t;
 
-static portINLINE int prvSocketValid( Socket_t xSocket )
+static portINLINE unsigned int prvSocketValid( Socket_t xSocket )
 {
     /* coverity[misra_c_2012_rule_11_4_violation] */
     return ( ( xSocket != FREERTOS_INVALID_SOCKET ) && ( xSocket != NULL ) );