Fix build

tony-josi-aws · May 22, 2024 · 2f512f2 · 2f512f2
1 parent 704557e
commit 2f512f2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/source/FreeRTOS_Sockets.c b/source/FreeRTOS_Sockets.c
@@ -3894,7 +3894,7 @@ void vSocketWakeUpUser( FreeRTOS_Socket_t * pxSocket )
                 if( pxClientSocket != NULL )
 				{
 					FreeRTOS_printf( ( "prvAcceptWaitClient: client %p parent %p\n",
-                        pxClientSocket, pxParentSocket ) );
+                        ( void * ) pxClientSocket, ( void * ) pxParentSocket ) );
 				}
             }
             else

diff --git a/source/FreeRTOS_TCP_IP.c b/source/FreeRTOS_TCP_IP.c
@@ -274,7 +274,7 @@
     }
     /*-----------------------------------------------------------*/
 
-    BaseType_t vTCPRemoveTCPChild( const FreeRTOS_Socket_t * pxChildSocket )
+    static BaseType_t vTCPRemoveTCPChild( const FreeRTOS_Socket_t * pxChildSocket )
     {
 		BaseType_t xReturn = pdFALSE;
 		const ListItem_t * pxEnd = ( ( const ListItem_t * ) &( xBoundTCPSocketsList.xListEnd ) );
@@ -404,7 +404,6 @@
 
                     /* Don't need to access the parent socket anymore, so the
                      * reference 'pxPeerSocket' may be cleared. */
-                    // pxSocket->u.xTCP.pxPeerSocket = NULL;
                     pxSocket->u.xTCP.bits.bPassQueued = pdFALSE_UNSIGNED;
 
                     /* When true, this socket may be returned in a call to accept(). */
@@ -482,6 +481,7 @@
                     ( xParent->u.xTCP.pxPeerSocket == pxSocket ) )
                 {
                     xMustClear = pdTRUE;
+                    ( void ) xMustClear;
                 }
             }
             /* Socket goes to status eCLOSED because of a RST.
@@ -491,10 +491,10 @@
                 pxSocket->u.xTCP.bits.bPassAccept,
                 pxSocket->u.xTCP.bits.bReuseSocket ) );
             FreeRTOS_printf( ( "vTCPStateChange: me %p parent %p peer %p clear %d\n",
-                pxSocket,
-                xParent,
-                xParent ? xParent->u.xTCP.pxPeerSocket : NULL,
-                xMustClear ) );
+                ( void * ) pxSocket,
+                ( void * ) xParent,
+                xParent ? ( void * ) xParent->u.xTCP.pxPeerSocket : NULL,
+                ( int ) xMustClear ) );
 
             vTaskSuspendAll();
             {
@@ -504,6 +504,7 @@
                     if( pxSocket->u.xTCP.bits.bReuseSocket == pdFALSE_UNSIGNED )
                     {
                         xHasCleared = vTCPRemoveTCPChild( pxSocket );
+                        ( void ) xHasCleared;
 
                         pxSocket->u.xTCP.bits.bPassQueued = pdFALSE_UNSIGNED;
                         pxSocket->u.xTCP.bits.bPassAccept = pdFALSE_UNSIGNED;

diff --git a/source/FreeRTOS_TCP_State_Handling.c b/source/FreeRTOS_TCP_State_Handling.c
@@ -1030,9 +1030,9 @@
                                  pxSocket->u.xTCP.usChildCount,
                                  pxSocket->u.xTCP.usBacklog,
                                  ( pxSocket->u.xTCP.usChildCount == 1U ) ? "" : "ren",
-                                 pxNewSocket,
-                                 pxSocket,
-                                 pxSocket ? pxSocket->u.xTCP.pxPeerSocket : NULL ) );
+                                 ( void * ) pxNewSocket,
+                                 ( void * ) pxSocket,
+                                 pxSocket ? ( void * ) pxSocket->u.xTCP.pxPeerSocket : NULL ) );
 
         /* Now bind the child socket to the same port as the listening socket. */
         if( vSocketBind( pxNewSocket, &xAddress, sizeof( xAddress ), pdTRUE ) != 0 )