Update FreeRTOS+ more demos that use FreeRTOS+CLI to remove casting to int8_t * from...

[freertos] / FreeRTOS-Plus / Demo / Common / FreeRTOS_Plus_UDP_Demos / EchoClients / TwoEchoClients.c

diff --git a/FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/EchoClients/TwoEchoClients.c b/FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/EchoClients/TwoEchoClients.c
index b772bb868a5252ce9a911ca5a78d46e28764dc88..cd88b535a13241583021eb3998a27dbc38feec09 100644 (file)
--- a/FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/EchoClients/TwoEchoClients.c
+++ b/FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/EchoClients/TwoEchoClients.c
@@ -156,7 +156,7 @@ static void prvEchoClientTask( void *pvParameters )
 {\r
 xSocket_t xSocket;\r
 struct freertos_sockaddr xEchoServerAddress;\r
-int8_t cTxString[ 25 ], cRxString[ 25 ]; /* Make sure the stack is large enough to hold these.  Turn on stack overflow checking during debug to be sure. */\r
+char cTxString[ 25 ], cRxString[ 25 ]; /* Make sure the stack is large enough to hold these.  Turn on stack overflow checking during debug to be sure. */\r
 int32_t lLoopCount = 0UL;\r
 const int32_t lMaxLoopCount = 50;\r
 volatile uint32_t ulRxCount = 0UL, ulTxCount = 0UL;\r
@@ -188,7 +188,7 @@ uint32_t xAddressLength = sizeof( xEchoServerAddress );
                for( lLoopCount = 0; lLoopCount < lMaxLoopCount; lLoopCount++ )\r
                {\r
                        /* Create the string that is sent to the echo server. */\r
-                       sprintf( ( char * ) cTxString, "Message number %u\r\n", ( unsigned int ) ulTxCount );\r
+                       sprintf( cTxString, "Message number %u\r\n", ( unsigned int ) ulTxCount );\r
 \r
                        /* Send the string to the socket.  ulFlags is set to 0, so the zero\r
                        copy interface is not used.  That means the data from cTxString is\r
@@ -197,7 +197,7 @@ uint32_t xAddressLength = sizeof( xEchoServerAddress );
                        to ensure the NULL string terminator is sent as part of the message. */\r
                        FreeRTOS_sendto( xSocket,                               /* The socket being sent to. */\r
                                                        ( void * ) cTxString,   /* The data being sent. */\r
-                                                       strlen( ( const char * ) cTxString ) + 1, /* The length of the data being sent. */\r
+                                                       strlen( cTxString ) + 1,/* The length of the data being sent. */\r
                                                        0,                                              /* ulFlags with the FREERTOS_ZERO_COPY bit clear. */\r
                                                        &xEchoServerAddress,    /* The destination address. */\r
                                                        sizeof( xEchoServerAddress ) );\r
@@ -223,7 +223,7 @@ uint32_t xAddressLength = sizeof( xEchoServerAddress );
                                                                &xAddressLength );\r
 \r
                        /* Compare the transmitted string to the received string. */\r
-                       if( strcmp( ( char * ) cRxString, ( char * ) cTxString ) == 0 )\r
+                       if( strcmp( cRxString, cTxString ) == 0 )\r
                        {\r
                                /* The echo reply was received without error. */\r
                                ulRxCount++;\r
@@ -244,7 +244,7 @@ static void prvZeroCopyEchoClientTask( void *pvParameters )
 {\r
 xSocket_t xSocket;\r
 struct freertos_sockaddr xEchoServerAddress;\r
-static int8_t cTxString[ 40 ];\r
+static char cTxString[ 40 ];\r
 int32_t lLoopCount = 0UL;\r
 volatile uint32_t ulRxCount = 0UL, ulTxCount = 0UL;\r
 uint32_t xAddressLength = sizeof( xEchoServerAddress );\r
@@ -252,9 +252,9 @@ int32_t lReturned;
 uint8_t *pucUDPPayloadBuffer;\r
 \r
 const int32_t lMaxLoopCount = 50;\r
-const uint8_t * const pucStringToSend = ( const uint8_t * const ) "Zero copy message number";\r
+const char * const pcStringToSend = "Zero copy message number";\r
 /* The buffer is large enough to hold the string, a number, and the string terminator. */\r
-const size_t xBufferLength = strlen( ( char * ) pucStringToSend ) + 15;\r
+const size_t xBufferLength = strlen( pcStringToSend ) + 15;\r
 \r
        #if ipconfigINCLUDE_EXAMPLE_FREERTOS_PLUS_TRACE_CALLS == 1\r
        {\r
@@ -309,11 +309,11 @@ const size_t xBufferLength = strlen( ( char * ) pucStringToSend ) + 15;
                                /* A buffer was successfully obtained.  Create the string that is\r
                                sent to the echo server.  Note the string is written directly\r
                                into the buffer obtained from the IP stack. */\r
-                               sprintf( ( char * ) pucUDPPayloadBuffer, "%s %u\r\n", ( const char * ) "Zero copy message number", ( unsigned int ) ulTxCount );\r
+                               sprintf( ( char * ) pucUDPPayloadBuffer, "%s %u\r\n", "Zero copy message number", ( unsigned int ) ulTxCount );\r
 \r
                                /* Also copy the string into a local buffer so it can be compared\r
                                with the string that is later received back from the echo server. */\r
-                               strcpy( ( char * ) cTxString, ( char * ) pucUDPPayloadBuffer );\r
+                               strcpy( cTxString, ( char * ) pucUDPPayloadBuffer );\r
 \r
                                /* Pass the buffer into the send function.  ulFlags has the\r
                                FREERTOS_ZERO_COPY bit set so the IP stack will take control of\r
@@ -321,7 +321,7 @@ const size_t xBufferLength = strlen( ( char * ) pucStringToSend ) + 15;
                                echoMARK_SEND_IN_TRACE_BUFFER( xZeroCopySendEvent );\r
                                lReturned = FreeRTOS_sendto(    xSocket,                                        /* The socket being sent to. */\r
                                                                                                ( void * ) pucUDPPayloadBuffer, /* The buffer being passed into the IP stack. */\r
-                                                                                               strlen( ( const char * ) cTxString ) + 1, /* The length of the data being sent.  Plus 1 to ensure the null terminator is part of the data. */\r
+                                                                                               strlen( cTxString ) + 1,        /* The length of the data being sent.  Plus 1 to ensure the null terminator is part of the data. */\r
                                                                                                FREERTOS_ZERO_COPY,                     /* ulFlags with the zero copy bit is set. */\r
                                                                                                &xEchoServerAddress,            /* Where the data is being sent. */\r
                                                                                                sizeof( xEchoServerAddress ) );\r
@@ -372,7 +372,7 @@ const size_t xBufferLength = strlen( ( char * ) pucStringToSend ) + 15;
                                {\r
                                        /* Compare the string sent to the echo server with the string\r
                                        received back from the echo server. */\r
-                                       if( strcmp( ( char * ) pucUDPPayloadBuffer, ( char * ) cTxString ) == 0 )\r
+                                       if( strcmp( ( char * ) pucUDPPayloadBuffer, cTxString ) == 0 )\r
                                        {\r
                                                /* The strings matched. */\r
                                                ulRxCount++;\r