From 3517bbdccedaa677f78f57a95fa1fb4aa60f77b1 Mon Sep 17 00:00:00 2001
From: Richard Barry <ribarry@amazon.com>
Date: Fri, 27 Dec 2013 16:23:07 +0000
Subject: [PATCH] Remove unnecessary 'signed char *' casts from strings that
 are now just plain char * types in the FreeRTOS-Plus directory.

---
 .../Sample-CLI-commands.c                     |  4 +--
 .../CLICommands/CLI-commands.c                |  6 ++--
 .../CLICommands/UDPCommandServer.c            |  2 +-
 .../EchoClients/TwoEchoClients.c              | 28 ++++++++--------
 .../CLI-commands.c                            |  6 ++--
 .../main.c                                    | 18 +++++------
 .../main.c                                    |  2 +-
 .../Sample-CLI-commands.c                     |  6 ++--
 .../main.c                                    |  4 +--
 .../CLI-commands.c                            |  6 ++--
 .../Examples/USB_CDC/CDCCommandConsole.c      | 16 +++++-----
 .../LEDs.c                                    | 12 +++----
 .../DemoTasks/SelectServer.c                  |  6 ++--
 .../DemoTasks/UDPCommandServer.c              | 24 +++++++-------
 .../FreeRTOSConfig.h                          |  8 ++---
 .../WinPCap/arch.c                            |  2 +-
 .../main.c                                    |  4 +--
 .../Source/FreeRTOS-Plus-UDP/FreeRTOS_DHCP.c  | 18 +++++------
 .../FreeRTOS-Plus-UDP/FreeRTOS_UDP_IP.c       |  6 ++--
 .../BufferManagement/BufferAllocation_2.c     |  2 +-
 .../LPC17xx/NetworkInterface.c                |  2 +-
 .../NetworkInterface.c                        |  8 ++---
 .../Using_LPCOpen_Library/NetworkInterface.c  | 18 +++++------
 .../NetworkInterface/SAM4E/NetworkInterface.c | 32 +++++++++----------
 .../NetworkInterface/SH2A/NetworkInterface.c  | 18 +++++------
 .../WinPCap/NetworkInterface.c                |  2 +-
 26 files changed, 130 insertions(+), 130 deletions(-)

diff --git a/FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_CLI_Demos/Sample-CLI-commands.c b/FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_CLI_Demos/Sample-CLI-commands.c
index 3db7cc5016..7050c65c83 100644
--- a/FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_CLI_Demos/Sample-CLI-commands.c
+++ b/FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_CLI_Demos/Sample-CLI-commands.c
@@ -202,7 +202,7 @@ const int8_t *const pcHeader = ( int8_t * ) "Task          State  Priority  Stac
 
 	/* Generate a table of task stats. */
 	strcpy( ( char * ) pcWriteBuffer, ( char * ) pcHeader );
-	vTaskList( pcWriteBuffer + strlen( ( char * ) pcHeader ) );
+	vTaskList( ( char * ) pcWriteBuffer + strlen( ( char * ) pcHeader ) );
 
 	/* There is no more data to return after this single string, so return
 	pdFALSE. */
@@ -223,7 +223,7 @@ const int8_t * const pcHeader = ( int8_t * ) "Task            Abs Time      % Ti
 
 	/* Generate a table of task stats. */
 	strcpy( ( char * ) pcWriteBuffer, ( char * ) pcHeader );
-	vTaskGetRunTimeStats( pcWriteBuffer + strlen( ( char * ) pcHeader ) );
+	vTaskGetRunTimeStats( ( char * ) pcWriteBuffer + strlen( ( char * ) pcHeader ) );
 
 	/* There is no more data to return after this single string, so return
 	pdFALSE. */
diff --git a/FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/CLICommands/CLI-commands.c b/FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/CLICommands/CLI-commands.c
index eeae46d20c..23c9292a6a 100644
--- a/FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/CLICommands/CLI-commands.c
+++ b/FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/CLICommands/CLI-commands.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. 
+    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.
     All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
@@ -261,7 +261,7 @@ const int8_t *const pcHeader = ( int8_t * ) "Task          State  Priority  Stac
 
 	/* Generate a table of task stats. */
 	strcpy( ( char * ) pcWriteBuffer, ( char * ) pcHeader );
-	vTaskList( pcWriteBuffer + strlen( ( char * ) pcHeader ) );
+	vTaskList( ( char * ) pcWriteBuffer + strlen( ( char * ) pcHeader ) );
 
 	/* There is no more data to return after this single string, so return
 	pdFALSE. */
@@ -282,7 +282,7 @@ const int8_t * const pcHeader = ( int8_t * ) "Task            Abs Time      % Ti
 
 	/* Generate a table of task stats. */
 	strcpy( ( char * ) pcWriteBuffer, ( char * ) pcHeader );
-	vTaskGetRunTimeStats( pcWriteBuffer + strlen( ( char * ) pcHeader ) );
+	vTaskGetRunTimeStats( ( char * ) pcWriteBuffer + strlen( ( char * ) pcHeader ) );
 
 	/* There is no more data to return after this single string, so return
 	pdFALSE. */
diff --git a/FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/CLICommands/UDPCommandServer.c b/FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/CLICommands/UDPCommandServer.c
index 0210ed936d..819d13bfb4 100644
--- a/FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/CLICommands/UDPCommandServer.c
+++ b/FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/CLICommands/UDPCommandServer.c
@@ -104,7 +104,7 @@ static xSocket_t prvOpenUDPServerSocket( uint16_t usPort );
 
 void vStartUDPCommandInterpreterTask( uint16_t usStackSize, uint32_t ulPort, unsigned portBASE_TYPE uxPriority )
 {
-	xTaskCreate( vUDPCommandInterpreterTask, ( signed char * ) "CLI", usStackSize, ( void * ) ulPort, uxPriority, NULL );
+	xTaskCreate( vUDPCommandInterpreterTask, "CLI", usStackSize, ( void * ) ulPort, uxPriority, NULL );
 }
 /*-----------------------------------------------------------*/
 
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 467cbb6565..b772bb868a 100644
--- a/FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/EchoClients/TwoEchoClients.c
+++ b/FreeRTOS-Plus/Demo/Common/FreeRTOS_Plus_UDP_Demos/EchoClients/TwoEchoClients.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. 
+    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.
     All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
@@ -66,7 +66,7 @@
 
 /******************************************************************************
  *
- * See the following web page for essential TwoEchoClient.c usage and 
+ * See the following web page for essential TwoEchoClient.c usage and
  * configuration details:
  * http://www.FreeRTOS.org/FreeRTOS-Plus/FreeRTOS_Plus_UDP/Embedded_Ethernet_Examples/Common_Echo_Clients.shtml
  *
@@ -135,20 +135,20 @@ because simulated time is slower than real time. */
 void vStartEchoClientTasks( uint16_t usTaskStackSize, unsigned portBASE_TYPE uxTaskPriority )
 {
 	/* Create the echo client task that does not use the zero copy interface. */
-	xTaskCreate( 	prvEchoClientTask,						/* The function that implements the task. */
-					( const signed char * const ) "Echo0",	/* Just a text name for the task to aid debugging. */
-					usTaskStackSize,						/* The stack size is defined in FreeRTOSIPConfig.h. */
-					NULL,									/* The task parameter, not used in this case. */
-					uxTaskPriority,							/* The priority assigned to the task is defined in FreeRTOSConfig.h. */
-					NULL );									/* The task handle is not used. */
+	xTaskCreate( 	prvEchoClientTask,	/* The function that implements the task. */
+					"Echo0",			/* Just a text name for the task to aid debugging. */
+					usTaskStackSize,	/* The stack size is defined in FreeRTOSIPConfig.h. */
+					NULL,				/* The task parameter, not used in this case. */
+					uxTaskPriority,		/* The priority assigned to the task is defined in FreeRTOSConfig.h. */
+					NULL );				/* The task handle is not used. */
 
 	/* Create the echo client task that does use the zero copy interface. */
-	xTaskCreate( 	prvZeroCopyEchoClientTask,				/* The function that implements the task. */
-					( const signed char * const ) "Echo1",	/* Just a text name for the task to aid debugging. */
-					usTaskStackSize,						/* The stack size is defined in FreeRTOSIPConfig.h. */
-					NULL,									/* The task parameter, not used in this case. */
-					uxTaskPriority,							/* The priority assigned to the task is defined in FreeRTOSConfig.h. */
-					NULL );									/* The task handle is not used. */
+	xTaskCreate( 	prvZeroCopyEchoClientTask,	/* The function that implements the task. */
+					"Echo1",					/* Just a text name for the task to aid debugging. */
+					usTaskStackSize,			/* The stack size is defined in FreeRTOSIPConfig.h. */
+					NULL,						/* The task parameter, not used in this case. */
+					uxTaskPriority,				/* The priority assigned to the task is defined in FreeRTOSConfig.h. */
+					NULL );						/* The task handle is not used. */
 }
 /*-----------------------------------------------------------*/
 
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_CLI_with_Trace_Windows_Simulator/CLI-commands.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_CLI_with_Trace_Windows_Simulator/CLI-commands.c
index 220d096f24..39e130088e 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_CLI_with_Trace_Windows_Simulator/CLI-commands.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_CLI_with_Trace_Windows_Simulator/CLI-commands.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. 
+    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.
     All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
@@ -185,7 +185,7 @@ const int8_t *const pcHeader = ( int8_t * ) "Task          State  Priority  Stac
 
 	/* Generate a table of task stats. */
 	strcpy( ( char * ) pcWriteBuffer, ( char * ) pcHeader );
-	vTaskList( pcWriteBuffer + strlen( ( char * ) pcHeader ) );
+	vTaskList( ( char * ) pcWriteBuffer + strlen( ( char * ) pcHeader ) );
 
 	/* There is no more data to return after this single string, so return
 	pdFALSE. */
@@ -206,7 +206,7 @@ const int8_t * const pcHeader = ( int8_t * ) "Task            Abs Time      % Ti
 
 	/* Generate a table of task stats. */
 	strcpy( ( char * ) pcWriteBuffer, ( char * ) pcHeader );
-	vTaskGetRunTimeStats( pcWriteBuffer + strlen( ( char * ) pcHeader ) );
+	vTaskGetRunTimeStats( ( char * ) pcWriteBuffer + strlen( ( char * ) pcHeader ) );
 
 	/* There is no more data to return after this single string, so return
 	pdFALSE. */
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_CLI_with_Trace_Windows_Simulator/main.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_CLI_with_Trace_Windows_Simulator/main.c
index 118daa54ed..48ca6f7430 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_CLI_with_Trace_Windows_Simulator/main.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_CLI_with_Trace_Windows_Simulator/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. 
+    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.
     All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
@@ -70,9 +70,9 @@
  * application.  It is provided as a convenient development and demonstration
  * test bed only.  This was tested using Windows XP on a dual core laptop.
  *
- * Windows will not be running the FreeRTOS simulator threads continuously, so 
- * the timing information in the FreeRTOS+Trace logs have no meaningful units.  
- * See the documentation page for the Windows simulator for an explanation of 
+ * Windows will not be running the FreeRTOS simulator threads continuously, so
+ * the timing information in the FreeRTOS+Trace logs have no meaningful units.
+ * See the documentation page for the Windows simulator for an explanation of
  * the slow timing:
  * http://www.freertos.org/FreeRTOS-Windows-Simulator-Emulator-for-Visual-Studio-and-Eclipse-MingW.html
  * - READ THE WEB DOCUMENTATION FOR THIS PORT FOR MORE INFORMATION ON USING IT -
@@ -184,17 +184,17 @@ const uint32_t ulLongTime_ms = 250UL;
 	/* Start the two tasks as described in the comments at the top of this
 	file. */
 	xTaskCreate( prvQueueReceiveTask,				/* The function that implements the task. */
-				( signed char * ) "Rx", 			/* The text name assigned to the task - for debug only as it is not used by the kernel. */
+				"Rx", 								/* The text name assigned to the task - for debug only as it is not used by the kernel. */
 				configMINIMAL_STACK_SIZE, 			/* The size of the stack to allocate to the task.  Not actually used as a stack in the Win32 simulator port. */
 				NULL,								/* The parameter passed to the task - not used in this example. */
 				mainQUEUE_RECEIVE_TASK_PRIORITY, 	/* The priority assigned to the task. */
 				NULL );								/* The task handle is not required, so NULL is passed. */
 
-	xTaskCreate( prvQueueSendTask, ( signed char * ) "TX", configMINIMAL_STACK_SIZE, NULL, mainQUEUE_SEND_TASK_PRIORITY, NULL );
+	xTaskCreate( prvQueueSendTask, "TX", configMINIMAL_STACK_SIZE, NULL, mainQUEUE_SEND_TASK_PRIORITY, NULL );
 
 	/* Create the task that handles the CLI on a UDP port.  The port number
 	is set using the configUDP_CLI_PORT_NUMBER setting in FreeRTOSConfig.h. */
-	xTaskCreate( vUDPCommandInterpreterTask, ( signed char * ) "CLI", configMINIMAL_STACK_SIZE, NULL, mainUDP_CLI_TASK_PRIORITY, NULL );
+	xTaskCreate( vUDPCommandInterpreterTask, "CLI", configMINIMAL_STACK_SIZE, NULL, mainUDP_CLI_TASK_PRIORITY, NULL );
 
 	/* Register commands with the FreeRTOS+CLI command interpreter. */
 	vRegisterCLICommands();
@@ -293,10 +293,10 @@ const unsigned long ulLongSleep = 1000UL;
 
 void vApplicationTickHook( void )
 {
-	/* Write a user event to the trace log.  
+	/* Write a user event to the trace log.
 	Note tick events will not appear in the trace recording with regular period
 	because this project runs in a Windows simulator, and does not therefore
 	exhibit deterministic behaviour. */
-	vTraceUserEvent( xTickTraceUserEvent );					
+	vTraceUserEvent( xTickTraceUserEvent );
 }
 
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_CyaSSL_Windows_Simulator/main.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_CyaSSL_Windows_Simulator/main.c
index 14a9fd3687..078ddaee78 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_CyaSSL_Windows_Simulator/main.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_CyaSSL_Windows_Simulator/main.c
@@ -98,7 +98,7 @@ const uint32_t ulLongTime_ms = 250UL;
 
 	/* Create the TCP server task.  This will itself create the client task
 	once it has completed the CyaSSL initialisation. */
-	xTaskCreate( vSecureTCPServerTask, ( signed char * ) "Server", configMINIMAL_STACK_SIZE, NULL, mainSECURE_SERVER_TASK_PRIORITY, NULL );
+	xTaskCreate( vSecureTCPServerTask, "Server", configMINIMAL_STACK_SIZE, NULL, mainSECURE_SERVER_TASK_PRIORITY, NULL );
 
 	/* Start the task running. */
 	vTaskStartScheduler();
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_FAT_SL_and_CLI_Windows_Simulator/Sample-CLI-commands.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_FAT_SL_and_CLI_Windows_Simulator/Sample-CLI-commands.c
index a2a28ba618..bf55a8d8bb 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_FAT_SL_and_CLI_Windows_Simulator/Sample-CLI-commands.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_FAT_SL_and_CLI_Windows_Simulator/Sample-CLI-commands.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. 
+    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.
     All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
@@ -200,7 +200,7 @@ const int8_t *const pcHeader = ( int8_t * ) "Task          State  Priority  Stac
 
 	/* Generate a table of task stats. */
 	strcpy( ( char * ) pcWriteBuffer, ( char * ) pcHeader );
-	vTaskList( pcWriteBuffer + strlen( ( char * ) pcHeader ) );
+	vTaskList( ( char * ) pcWriteBuffer + strlen( ( char * ) pcHeader ) );
 
 	/* There is no more data to return after this single string, so return
 	pdFALSE. */
@@ -221,7 +221,7 @@ const int8_t * const pcHeader = ( int8_t * ) "Task            Abs Time      % Ti
 
 	/* Generate a table of task stats. */
 	strcpy( ( char * ) pcWriteBuffer, ( char * ) pcHeader );
-	vTaskGetRunTimeStats( pcWriteBuffer + strlen( ( char * ) pcHeader ) );
+	vTaskGetRunTimeStats( ( char * ) pcWriteBuffer + strlen( ( char * ) pcHeader ) );
 
 	/* There is no more data to return after this single string, so return
 	pdFALSE. */
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_FAT_SL_and_CLI_Windows_Simulator/main.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_FAT_SL_and_CLI_Windows_Simulator/main.c
index d3048d39b2..2fd7c5d188 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_FAT_SL_and_CLI_Windows_Simulator/main.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_FAT_SL_and_CLI_Windows_Simulator/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. 
+    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.
     All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
@@ -148,7 +148,7 @@ const uint32_t ulLongTime_ms = 250UL;
 	/* Create the task that handles the CLI on a UDP port.  The port number
 	is set using the configUDP_CLI_PORT_NUMBER setting in FreeRTOSConfig.h. */
 	xTaskCreate( vUDPCommandInterpreterTask, 	/* The function that implements the command interpreter IO handling. */
-				( signed char * ) "CLI", 		/* The name of the task - just to assist debugging. */
+				"CLI", 							/* The name of the task - just to assist debugging. */
 				configMINIMAL_STACK_SIZE, NULL, /* The size of the stack allocated to the task. */
 				mainUDP_CLI_TASK_PRIORITY, 		/* The priority at which the task will run. */
 				NULL );							/* A handle to the task is not required, so NULL is passed. */
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/CLI-commands.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/CLI-commands.c
index eeae46d20c..23c9292a6a 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/CLI-commands.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/CLI-commands.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. 
+    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.
     All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
@@ -261,7 +261,7 @@ const int8_t *const pcHeader = ( int8_t * ) "Task          State  Priority  Stac
 
 	/* Generate a table of task stats. */
 	strcpy( ( char * ) pcWriteBuffer, ( char * ) pcHeader );
-	vTaskList( pcWriteBuffer + strlen( ( char * ) pcHeader ) );
+	vTaskList( ( char * ) pcWriteBuffer + strlen( ( char * ) pcHeader ) );
 
 	/* There is no more data to return after this single string, so return
 	pdFALSE. */
@@ -282,7 +282,7 @@ const int8_t * const pcHeader = ( int8_t * ) "Task            Abs Time      % Ti
 
 	/* Generate a table of task stats. */
 	strcpy( ( char * ) pcWriteBuffer, ( char * ) pcHeader );
-	vTaskGetRunTimeStats( pcWriteBuffer + strlen( ( char * ) pcHeader ) );
+	vTaskGetRunTimeStats( ( char * ) pcWriteBuffer + strlen( ( char * ) pcHeader ) );
 
 	/* There is no more data to return after this single string, so return
 	pdFALSE. */
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/Examples/USB_CDC/CDCCommandConsole.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/Examples/USB_CDC/CDCCommandConsole.c
index 5ed2f33ba1..99d3772b46 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/Examples/USB_CDC/CDCCommandConsole.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/Examples/USB_CDC/CDCCommandConsole.c
@@ -125,16 +125,16 @@ void vCDCCommandConsoleStart( uint16_t usStackSize, unsigned portBASE_TYPE uxPri
 
 	/* Add the semaphore and mutex to the queue registry for viewing in the
 	kernel aware state viewer. */
-	vQueueAddToRegistry( xCDCMutex, ( signed char * ) "CDCMu" );
-	vQueueAddToRegistry( xNewDataSemaphore, ( signed char * ) "CDCDat" );
+	vQueueAddToRegistry( xCDCMutex, "CDCMu" );
+	vQueueAddToRegistry( xNewDataSemaphore, "CDCDat" );
 
 	/* Create that task that handles the console itself. */
-	xTaskCreate( 	prvCDCCommandConsoleTask,			/* The task that implements the command console. */
-					( const int8_t * const ) "CDCCmd",	/* Text name assigned to the task.  This is just to assist debugging.  The kernel does not use this name itself. */
-					usStackSize,						/* The size of the stack allocated to the task. */
-					NULL,								/* The parameter is not used, so NULL is passed. */
-					uxPriority,							/* The priority allocated to the task. */
-					NULL );								/* A handle is not required, so just pass NULL. */
+	xTaskCreate( 	prvCDCCommandConsoleTask,	/* The task that implements the command console. */
+					"CDCCmd",					/* Text name assigned to the task.  This is just to assist debugging.  The kernel does not use this name itself. */
+					usStackSize,				/* The size of the stack allocated to the task. */
+					NULL,						/* The parameter is not used, so NULL is passed. */
+					uxPriority,					/* The priority allocated to the task. */
+					NULL );						/* A handle is not required, so just pass NULL. */
 }
 /*-----------------------------------------------------------*/
 
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/LEDs.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/LEDs.c
index ec560bbd79..3a168d0eea 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/LEDs.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/LEDs.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. 
+    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.
     All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
@@ -100,11 +100,11 @@ static xTimerHandle xLEDToggleTimer = NULL;
 	GPIO_SetDir( ledLED1_PORT, ledLED1_BIT, 1 );
 
     /* Create the timer used to toggle LED0. */
-	xLEDToggleTimer = xTimerCreate(	( const int8_t * ) "LEDTmr", 	/* Just a text name to associate with the timer, useful for debugging, but not used by the kernel. */
-								ledTOGGLE_RATE,						/* The period of the timer. */
-								pdTRUE,								/* This timer will autoreload, so uxAutoReload is set to pdTRUE. */
-								NULL,								/* The timer ID is not used, so can be set to NULL. */
-								prvLEDToggleTimerCallback );		/* The callback function executed each time the timer expires. */
+	xLEDToggleTimer = xTimerCreate(	"LEDTmr", 		/* Just a text name to associate with the timer, useful for debugging, but not used by the kernel. */
+									ledTOGGLE_RATE,	/* The period of the timer. */
+									pdTRUE,			/* This timer will autoreload, so uxAutoReload is set to pdTRUE. */
+									NULL,			/* The timer ID is not used, so can be set to NULL. */
+									prvLEDToggleTimerCallback );		/* The callback function executed each time the timer expires. */
 
     /* Sanity check that the timer was actually created. */
     configASSERT( xLEDToggleTimer );
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/DemoTasks/SelectServer.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/DemoTasks/SelectServer.c
index 2f9a77c854..61c7a16442 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/DemoTasks/SelectServer.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/DemoTasks/SelectServer.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. 
+    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.
     All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
@@ -107,8 +107,8 @@ void vStartSelectUDPServerTasks( uint16_t usStackSize, uint32_t ulFirstPortNumbe
 	FreeRTOS_select() function to receive from multiple sockets.  The first
 	port number to use is passed into both tasks using the task's parameter.
 	Other port numbers are consecutive from the first. */
-	xTaskCreate( prvMultipleSocketTxTask, ( const signed char * const ) "MultiTx", usStackSize, ( void * ) ulFirstPortNumber, uxPriority, NULL );
-	xTaskCreate( prvMultipleSocketRxTask, ( const signed char * const ) "MultiRx", usStackSize, ( void * ) ulFirstPortNumber, uxPriority, NULL );
+	xTaskCreate( prvMultipleSocketTxTask, "MultiTx", usStackSize, ( void * ) ulFirstPortNumber, uxPriority, NULL );
+	xTaskCreate( prvMultipleSocketRxTask, "MultiRx", usStackSize, ( void * ) ulFirstPortNumber, uxPriority, NULL );
 }
 /*-----------------------------------------------------------*/
 
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/DemoTasks/UDPCommandServer.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/DemoTasks/UDPCommandServer.c
index 87b59607ac..4b7198585b 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/DemoTasks/UDPCommandServer.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/DemoTasks/UDPCommandServer.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. 
+    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd.
     All rights reserved
 
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.
@@ -104,11 +104,11 @@ static xSocket_t prvOpenUDPServerSocket( uint16_t usPort );
 
 void vStartUDPCommandInterpreterTask( uint16_t usStackSize, uint32_t ulPort, unsigned portBASE_TYPE uxPriority )
 {
-	xTaskCreate( vUDPCommandInterpreterTask, ( signed char * ) "CLI", usStackSize, ( void * ) ulPort, uxPriority, NULL );
+	xTaskCreate( vUDPCommandInterpreterTask, "CLI", usStackSize, ( void * ) ulPort, uxPriority, NULL );
 }
 /*-----------------------------------------------------------*/
 
-/* 
+/*
  * Task that provides the input and output for the FreeRTOS+CLI command
  * interpreter.  In this case a UDP port is used.  See the URL in the comments
  * within main.c for the location of the online documentation.
@@ -154,25 +154,25 @@ extern const uint8_t ucMACAddress[ 6 ];
 					string. */
 					if( cInChar == '\n' )
 					{
-						/* Process the input string received prior to the 
+						/* Process the input string received prior to the
 						newline. */
 						do
 						{
 							/* Pass the string to FreeRTOS+CLI. */
 							xMoreDataToFollow = FreeRTOS_CLIProcessCommand( cInputString, cOutputString, cmdMAX_OUTPUT_SIZE );
-							
+
 							/* Send the output generated by the command's
 							implementation. */
 							FreeRTOS_sendto( xSocket, cOutputString,  strlen( ( const char * ) cOutputString ), 0, &xClient, xClientAddressLength );
 
 						} while( xMoreDataToFollow != pdFALSE ); /* Until the command does not generate any more output. */
 
-						/* All the strings generated by the command processing 
-						have been sent.  Clear the input string ready to receive 
+						/* All the strings generated by the command processing
+						have been sent.  Clear the input string ready to receive
 						the next command. */
 						cInputIndex = 0;
 						memset( cInputString, 0x00, cmdMAX_INPUT_SIZE );
-						
+
 						/* Transmit a spacer, just to make the command console
 						easier to read. */
 						FreeRTOS_sendto( xSocket, "\r\n",  strlen( "\r\n" ), 0, &xClient, xClientAddressLength );
@@ -181,12 +181,12 @@ extern const uint8_t ucMACAddress[ 6 ];
 					{
 						if( cInChar == '\r' )
 						{
-							/* Ignore the character.  Newlines are used to 
+							/* Ignore the character.  Newlines are used to
 							detect the end of the input string. */
 						}
 						else if( cInChar == '\b' )
 						{
-							/* Backspace was pressed.  Erase the last character 
+							/* Backspace was pressed.  Erase the last character
 							in the string - if any. */
 							if( cInputIndex > 0 )
 							{
@@ -208,7 +208,7 @@ extern const uint8_t ucMACAddress[ 6 ];
 					}
 				}
 			}
-		} 
+		}
 	}
 	else
 	{
@@ -234,7 +234,7 @@ xSocket_t xSocket = FREERTOS_INVALID_SOCKET;
 
 		/* Bind the address to the socket. */
 		if( FreeRTOS_bind( xSocket, &xServer, sizeof( xServer ) ) == -1 )
-		{			
+		{
 			FreeRTOS_closesocket( xSocket );
 			xSocket = FREERTOS_INVALID_SOCKET;
 		}
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/FreeRTOSConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/FreeRTOSConfig.h
index 7ad50016fc..3f8e244668 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/FreeRTOSConfig.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/FreeRTOSConfig.h
@@ -184,10 +184,10 @@ used. */
 /* The address of an echo server that will be used by the two demo echo client
 tasks.
 http://www.FreeRTOS.org/FreeRTOS-Plus/FreeRTOS_Plus_UDP/Embedded_Ethernet_Examples/Common_Echo_Clients.shtml */
-#define configECHO_SERVER_ADDR0	172
-#define configECHO_SERVER_ADDR1 25
-#define configECHO_SERVER_ADDR2 218
-#define configECHO_SERVER_ADDR3 200
+#define configECHO_SERVER_ADDR0	10
+#define configECHO_SERVER_ADDR1 134
+#define configECHO_SERVER_ADDR2 134
+#define configECHO_SERVER_ADDR3 71
 
 /* Default MAC address configuration.  The demo creates a virtual network
 connection that uses this MAC address by accessing the raw Ethernet/WiFi data
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/WinPCap/arch.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/WinPCap/arch.c
index 6714cc35b6..99ff961065 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/WinPCap/arch.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/WinPCap/arch.c
@@ -327,7 +327,7 @@ unsigned long ulNetMask;
 	/* Create a task that simulates an interrupt in a real system.  This will
 	block waiting for packets, then send a message to the uIP task when data
 	is available. */
-	xTaskCreate( prvInterruptSimulator, ( signed char * ) "MAC_ISR", configMINIMAL_STACK_SIZE, NULL, ( configuIP_TASK_PRIORITY - 1 ), NULL );
+	xTaskCreate( prvInterruptSimulator, "MAC_ISR", configMINIMAL_STACK_SIZE, NULL, ( configuIP_TASK_PRIORITY - 1 ), NULL );
 }
 /*-----------------------------------------------------------*/
 
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/main.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/main.c
index 2118dcc8e6..5b246aa769 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/main.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_Windows_Simulator/main.c
@@ -104,8 +104,8 @@
 exclude. */
 #define mainCREATE_UDP_CLI_TASKS					1
 #define mainCREATE_SIMPLE_UDP_CLIENT_SERVER_TASKS	0
-#define mainCREATE_SELECT_UDP_SERVER_TASKS			1
-#define mainCREATE_UDP_ECHO_TASKS					0
+#define mainCREATE_SELECT_UDP_SERVER_TASKS			0
+#define mainCREATE_UDP_ECHO_TASKS					1
 
 /*-----------------------------------------------------------*/
 
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/FreeRTOS_DHCP.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/FreeRTOS_DHCP.c
index b4fa727cc6..f62698ae3c 100644
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/FreeRTOS_DHCP.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/FreeRTOS_DHCP.c
@@ -5,11 +5,11 @@
  * This file is part of the FreeRTOS+UDP distribution.  The FreeRTOS+UDP license
  * terms are different to the FreeRTOS license terms.
  *
- * FreeRTOS+UDP uses a dual license model that allows the software to be used 
- * under a standard GPL open source license, or a commercial license.  The 
- * standard GPL license (unlike the modified GPL license under which FreeRTOS 
- * itself is distributed) requires that all software statically linked with 
- * FreeRTOS+UDP is also distributed under the same GPL V2 license terms.  
+ * FreeRTOS+UDP uses a dual license model that allows the software to be used
+ * under a standard GPL open source license, or a commercial license.  The
+ * standard GPL license (unlike the modified GPL license under which FreeRTOS
+ * itself is distributed) requires that all software statically linked with
+ * FreeRTOS+UDP is also distributed under the same GPL V2 license terms.
  * Details of both license options follow:
  *
  * - Open source licensing -
@@ -299,7 +299,7 @@ void vDHCPProcess( portBASE_TYPE xReset, xMACAddress_t *pxMACAddress, uint32_t *
 						/* Static configuration is being used, so the network is now up. */
 						#if ipconfigFREERTOS_PLUS_NABTO == 1
 						{
-							/* Return value is used in configASSERT() inside the 
+							/* Return value is used in configASSERT() inside the
 							function. */
 							( void ) xStartNabtoTask();
 						}
@@ -329,11 +329,11 @@ void vDHCPProcess( portBASE_TYPE xReset, xMACAddress_t *pxMACAddress, uint32_t *
 				}
 				#endif
 
-				/* Static configuration is being used, so the network is now 
+				/* Static configuration is being used, so the network is now
 				up. */
 				#if ipconfigFREERTOS_PLUS_NABTO == 1
 				{
-					/* Return value is used in configASSERT() inside the 
+					/* Return value is used in configASSERT() inside the
 					function. */
 					( void ) xStartNabtoTask();
 				}
@@ -451,7 +451,7 @@ extern void vIPFunctionsTimerCallback( xTimerHandle xTimer );
 
 	if( xDHCPTimer == NULL )
 	{
-		xDHCPTimer = xTimerCreate( ( const signed char * const ) "DHCP", dhcpINITIAL_TIMER_PERIOD, pdTRUE, ( void * ) eDHCPEvent, vIPFunctionsTimerCallback );
+		xDHCPTimer = xTimerCreate( "DHCP", dhcpINITIAL_TIMER_PERIOD, pdTRUE, ( void * ) eDHCPEvent, vIPFunctionsTimerCallback );
 		configASSERT( xDHCPTimer );
 		xTimerStart( xDHCPTimer, portMAX_DELAY );
 	}
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/FreeRTOS_UDP_IP.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/FreeRTOS_UDP_IP.c
index 0388026df8..6717b41054 100644
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/FreeRTOS_UDP_IP.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/FreeRTOS_UDP_IP.c
@@ -392,7 +392,7 @@ xIPStackEvent_t xReceivedEvent;
 
 	/* Create the ARP timer, but don't start it until the network has
 	connected. */
-	xARPTimer = xTimerCreate( 	( const signed char * const ) "ARPTimer", ( ipARP_TIMER_PERIOD_MS / portTICK_RATE_MS ), pdTRUE, ( void * ) eARPTimerEvent, vIPFunctionsTimerCallback );
+	xARPTimer = xTimerCreate( 	"ARPTimer", ( ipARP_TIMER_PERIOD_MS / portTICK_RATE_MS ), pdTRUE, ( void * ) eARPTimerEvent, vIPFunctionsTimerCallback );
 	configASSERT( xARPTimer );
 
 	/* Generate a dummy message to say that the network connection has gone
@@ -557,7 +557,7 @@ static portBASE_TYPE xReturn = pdFALSE;
 	{
 		xNetworkEventQueue = xQueueCreate( ipconfigEVENT_QUEUE_LENGTH, sizeof( xIPStackEvent_t ) );
 		configASSERT( xNetworkEventQueue );
-		vQueueAddToRegistry( xNetworkEventQueue, ( signed char * ) "NetEvnt" );
+		vQueueAddToRegistry( xNetworkEventQueue, "NetEvnt" );
 	}
 
 	if( xNetworkBuffersInitialise() == pdPASS )
@@ -597,7 +597,7 @@ static portBASE_TYPE xReturn = pdFALSE;
 				FreeRTOS_SocketsInit();
 
 				/* Create the task that processes Ethernet and stack events. */
-				xReturn = xTaskCreate( prvIPTask, ( const signed char * const ) "UDP/IP", ipconfigUDP_TASK_STACK_SIZE_WORDS, NULL, ipconfigUDP_TASK_PRIORITY, NULL );
+				xReturn = xTaskCreate( prvIPTask, "UDP/IP", ipconfigUDP_TASK_STACK_SIZE_WORDS, NULL, ipconfigUDP_TASK_PRIORITY, NULL );
 			}
 		}
 	}
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/BufferManagement/BufferAllocation_2.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/BufferManagement/BufferAllocation_2.c
index e6ab12c3ca..4f193a66e0 100644
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/BufferManagement/BufferAllocation_2.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/BufferManagement/BufferAllocation_2.c
@@ -95,7 +95,7 @@ portBASE_TYPE xReturn, x;
 	{
 		xNetworkBufferSemaphore = xSemaphoreCreateCounting( ipconfigNUM_NETWORK_BUFFERS, ipconfigNUM_NETWORK_BUFFERS );
 		configASSERT( xNetworkBufferSemaphore );
-		vQueueAddToRegistry( xNetworkBufferSemaphore, ( signed char * ) "NetBufSem" );
+		vQueueAddToRegistry( xNetworkBufferSemaphore, "NetBufSem" );
 
 		/* If the trace recorder code is included name the semaphore for viewing
 		in FreeRTOS+Trace.  */
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/LPC17xx/NetworkInterface.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/LPC17xx/NetworkInterface.c
index 224a1989e5..9777b06715 100644
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/LPC17xx/NetworkInterface.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/LPC17xx/NetworkInterface.c
@@ -122,7 +122,7 @@ extern uint8_t ucMACAddress[ 6 ];
 
 		/* The handler task is created at the highest possible priority to
 		ensure the interrupt handler can return directly to it. */
-		xTaskCreate( prvEMACHandlerTask, ( const signed char * const ) "EMAC", configMINIMAL_STACK_SIZE, NULL, configMAX_PRIORITIES - 1, NULL );
+		xTaskCreate( prvEMACHandlerTask, "EMAC", configMINIMAL_STACK_SIZE, NULL, configMAX_PRIORITIES - 1, NULL );
 
 		/* Enable the interrupt and set its priority to the minimum
 		interrupt priority.  */
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/LPC18xx/Using_CMSISv2p10_LPC18xx_DriverLib/NetworkInterface.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/LPC18xx/Using_CMSISv2p10_LPC18xx_DriverLib/NetworkInterface.c
index ae7c06af96..4f848aff2b 100644
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/LPC18xx/Using_CMSISv2p10_LPC18xx_DriverLib/NetworkInterface.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/LPC18xx/Using_CMSISv2p10_LPC18xx_DriverLib/NetworkInterface.c
@@ -19,9 +19,9 @@
  *
  * - Commercial licensing -
  * Businesses and individuals that for commercial or other reasons cannot comply
- * with the terms of the GPL V2 license must obtain a commercial license before 
- * incorporating FreeRTOS+UDP into proprietary software for distribution in any 
- * form.  Commercial licenses can be purchased from http://shop.freertos.org/udp 
+ * with the terms of the GPL V2 license must obtain a commercial license before
+ * incorporating FreeRTOS+UDP into proprietary software for distribution in any
+ * form.  Commercial licenses can be purchased from http://shop.freertos.org/udp
  * and do not require any source files to be changed.
  *
  * FreeRTOS+UDP is distributed in the hope that it will be useful.  You cannot
@@ -124,7 +124,7 @@ extern uint8_t ucMACAddress[ 6 ];
 		possible priority to ensure the interrupt handler can return directly to
 		it no matter which task was running when the interrupt occurred. */
 		xTaskCreate( 	prvEMACDeferredInterruptHandlerTask,		/* The function that implements the task. */
-						( const signed char * const ) "MACTsk",
+						"MACTsk",
 						configMINIMAL_STACK_SIZE,	/* Stack allocated to the task (defined in words, not bytes). */
 						NULL, 						/* The task parameter is not used. */
 						configMAX_PRIORITIES - 1, 	/* The priority assigned to the task. */
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/LPC18xx/Using_LPCOpen_Library/NetworkInterface.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/LPC18xx/Using_LPCOpen_Library/NetworkInterface.c
index 7bfbbfcc86..9ffce22ce3 100644
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/LPC18xx/Using_LPCOpen_Library/NetworkInterface.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/LPC18xx/Using_LPCOpen_Library/NetworkInterface.c
@@ -5,11 +5,11 @@
  * This file is part of the FreeRTOS+UDP distribution.  The FreeRTOS+UDP license
  * terms are different to the FreeRTOS license terms.
  *
- * FreeRTOS+UDP uses a dual license model that allows the software to be used 
- * under a standard GPL open source license, or a commercial license.  The 
- * standard GPL license (unlike the modified GPL license under which FreeRTOS 
- * itself is distributed) requires that all software statically linked with 
- * FreeRTOS+UDP is also distributed under the same GPL V2 license terms.  
+ * FreeRTOS+UDP uses a dual license model that allows the software to be used
+ * under a standard GPL open source license, or a commercial license.  The
+ * standard GPL license (unlike the modified GPL license under which FreeRTOS
+ * itself is distributed) requires that all software statically linked with
+ * FreeRTOS+UDP is also distributed under the same GPL V2 license terms.
  * Details of both license options follow:
  *
  * - Open source licensing -
@@ -21,9 +21,9 @@
  *
  * - Commercial licensing -
  * Businesses and individuals that for commercial or other reasons cannot comply
- * with the terms of the GPL V2 license must obtain a commercial license before 
- * incorporating FreeRTOS+UDP into proprietary software for distribution in any 
- * form.  Commercial licenses can be purchased from http://shop.freertos.org/udp 
+ * with the terms of the GPL V2 license must obtain a commercial license before
+ * incorporating FreeRTOS+UDP into proprietary software for distribution in any
+ * form.  Commercial licenses can be purchased from http://shop.freertos.org/udp
  * and do not require any source files to be changed.
  *
  * FreeRTOS+UDP is distributed in the hope that it will be useful.  You cannot
@@ -126,7 +126,7 @@ extern uint8_t ucMACAddress[ 6 ];
 			possible priority to ensure the interrupt handler can return directly to
 			it no matter which task was running when the interrupt occurred. */
 			xTaskCreate( 	prvEMACDeferredInterruptHandlerTask,/* The function that implements the task. */
-							( const signed char * const ) "MACTsk",
+							"MACTsk",
 							configMINIMAL_STACK_SIZE,	/* Stack allocated to the task (defined in words, not bytes). */
 							NULL, 						/* The task parameter is not used. */
 							configMAX_PRIORITIES - 1, 	/* The priority assigned to the task. */
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/SAM4E/NetworkInterface.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/SAM4E/NetworkInterface.c
index 462ffeddd2..0b330dce4c 100644
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/SAM4E/NetworkInterface.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/SAM4E/NetworkInterface.c
@@ -19,9 +19,9 @@
  *
  * - Commercial licensing -
  * Businesses and individuals that for commercial or other reasons cannot comply
- * with the terms of the GPL V2 license must obtain a commercial license before 
- * incorporating FreeRTOS+UDP into proprietary software for distribution in any 
- * form.  Commercial licenses can be purchased from http://shop.freertos.org/udp 
+ * with the terms of the GPL V2 license must obtain a commercial license before
+ * incorporating FreeRTOS+UDP into proprietary software for distribution in any
+ * form.  Commercial licenses can be purchased from http://shop.freertos.org/udp
  * and do not require any source files to be changed.
  *
  * FreeRTOS+UDP is distributed in the hope that it will be useful.  You cannot
@@ -98,7 +98,7 @@ const portTickType xPHYDelay_400ms = 400UL;
 portBASE_TYPE xReturn = pdFALSE;
 
 	/* Ensure PHY is ready. */
-	vTaskDelay( xPHYDelay_400ms / portTICK_RATE_MS );	
+	vTaskDelay( xPHYDelay_400ms / portTICK_RATE_MS );
 
 	/* Enable GMAC clock. */
 	pmc_enable_periph_clk( ID_GMAC );
@@ -117,13 +117,13 @@ portBASE_TYPE xReturn = pdFALSE;
 	if( ethernet_phy_init( GMAC, BOARD_GMAC_PHY_ADDR, sysclk_get_cpu_hz() ) == GMAC_OK )
 	{
 		/* Auto Negotiate, work in RMII mode. */
-		if( ethernet_phy_auto_negotiate( GMAC, BOARD_GMAC_PHY_ADDR ) == GMAC_OK ) 
+		if( ethernet_phy_auto_negotiate( GMAC, BOARD_GMAC_PHY_ADDR ) == GMAC_OK )
 		{
 			/* Establish Ethernet link. */
 			vTaskDelay( xPHYDelay_400ms * 2UL );
 			if( ethernet_phy_set_link( GMAC, BOARD_GMAC_PHY_ADDR, 1 ) == GMAC_OK )
 			{
-				/* Create the event semaphore if it has not already been 
+				/* Create the event semaphore if it has not already been
 				created. */
 				if( xGMACRxEventSemaphore == NULL )
 				{
@@ -136,23 +136,23 @@ portBASE_TYPE xReturn = pdFALSE;
 					}
 					#endif /*  ipconfigINCLUDE_EXAMPLE_FREERTOS_PLUS_TRACE_CALLS == 1 */
 				}
-				
+
 				/* Register the callbacks. */
 				gmac_dev_set_rx_callback( &xGMACStruct, prvGMACRxCallback );
-				
-				/* The Rx deferred interrupt handler task is created at the 
-				highest	possible priority to ensure the interrupt handler can 
-				return directly to it no matter which task was running when the 
+
+				/* The Rx deferred interrupt handler task is created at the
+				highest	possible priority to ensure the interrupt handler can
+				return directly to it no matter which task was running when the
 				interrupt occurred. */
 				xTaskCreate( 	prvGMACDeferredInterruptHandlerTask,/* The function that implements the task. */
-								( const signed char * const ) "MACTsk",
+								"MACTsk",
 								configMINIMAL_STACK_SIZE,	/* Stack allocated to the task (defined in words, not bytes). */
 								NULL, 						/* The task parameter is not used. */
 								configMAX_PRIORITIES - 1, 	/* The priority assigned to the task. */
 								NULL );						/* The handle is not required, so NULL is passed. */
-				
-				/* Enable the interrupt and set its priority as configured.  
-				THIS DRIVER REQUIRES configMAC_INTERRUPT_PRIORITY TO BE DEFINED, 
+
+				/* Enable the interrupt and set its priority as configured.
+				THIS DRIVER REQUIRES configMAC_INTERRUPT_PRIORITY TO BE DEFINED,
 				PREFERABLY IN FreeRTOSConfig.h. */
 				NVIC_SetPriority( GMAC_IRQn, configMAC_INTERRUPT_PRIORITY );
 				NVIC_EnableIRQ( GMAC_IRQn );
@@ -235,7 +235,7 @@ uint32_t ulReturned;
 
 		/* Allocate a buffer to hold the data. */
 		pxNetworkBuffer = pxNetworkBufferGet( ipTOTAL_ETHERNET_FRAME_SIZE, xBufferWaitDelay );
-		
+
 		if( pxNetworkBuffer != NULL )
 		{
 			/* At least one packet has been received. */
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/SH2A/NetworkInterface.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/SH2A/NetworkInterface.c
index 0f3ffee9b1..1387562ac9 100644
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/SH2A/NetworkInterface.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/SH2A/NetworkInterface.c
@@ -5,11 +5,11 @@
  * This file is part of the FreeRTOS+UDP distribution.  The FreeRTOS+UDP license
  * terms are different to the FreeRTOS license terms.
  *
- * FreeRTOS+UDP uses a dual license model that allows the software to be used 
- * under a standard GPL open source license, or a commercial license.  The 
- * standard GPL license (unlike the modified GPL license under which FreeRTOS 
- * itself is distributed) requires that all software statically linked with 
- * FreeRTOS+UDP is also distributed under the same GPL V2 license terms.  
+ * FreeRTOS+UDP uses a dual license model that allows the software to be used
+ * under a standard GPL open source license, or a commercial license.  The
+ * standard GPL license (unlike the modified GPL license under which FreeRTOS
+ * itself is distributed) requires that all software statically linked with
+ * FreeRTOS+UDP is also distributed under the same GPL V2 license terms.
  * Details of both license options follow:
  *
  * - Open source licensing -
@@ -21,9 +21,9 @@
  *
  * - Commercial licensing -
  * Businesses and individuals that for commercial or other reasons cannot comply
- * with the terms of the GPL V2 license must obtain a commercial license before 
- * incorporating FreeRTOS+UDP into proprietary software for distribution in any 
- * form.  Commercial licenses can be purchased from http://shop.freertos.org/udp 
+ * with the terms of the GPL V2 license must obtain a commercial license before
+ * incorporating FreeRTOS+UDP into proprietary software for distribution in any
+ * form.  Commercial licenses can be purchased from http://shop.freertos.org/udp
  * and do not require any source files to be changed.
  *
  * FreeRTOS+UDP is distributed in the hope that it will be useful.  You cannot
@@ -113,7 +113,7 @@ extern uint8_t ucMACAddress[ 6 ];
 
 	/* The handler task is created at the highest possible priority to
 	ensure the interrupt handler can return directly to it. */
-	xTaskCreate( vEMACHandlerTask, ( const signed char * const ) "EMAC", configMINIMAL_STACK_SIZE, NULL, configMAX_PRIORITIES - 1, NULL );
+	xTaskCreate( vEMACHandlerTask, "EMAC", configMINIMAL_STACK_SIZE, NULL, configMAX_PRIORITIES - 1, NULL );
 	xReturn = pdPASS;
 
 	return xReturn;
diff --git a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/WinPCap/NetworkInterface.c b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/WinPCap/NetworkInterface.c
index 5fe2dadbaa..39615d84c5 100644
--- a/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/WinPCap/NetworkInterface.c
+++ b/FreeRTOS-Plus/Source/FreeRTOS-Plus-UDP/portable/NetworkInterface/WinPCap/NetworkInterface.c
@@ -382,7 +382,7 @@ unsigned long ulNetMask;
 	/* Create a task that simulates an interrupt in a real system.  This will
 	block waiting for packets, then send a message to the uIP task when data
 	is available. */
-	xTaskCreate( prvInterruptSimulatorTask, ( signed char * ) "MAC_ISR", configMINIMAL_STACK_SIZE, NULL, configMAC_ISR_SIMULATOR_PRIORITY, NULL );
+	xTaskCreate( prvInterruptSimulatorTask, "MAC_ISR", configMINIMAL_STACK_SIZE, NULL, configMAC_ISR_SIMULATOR_PRIORITY, NULL );
 }
 /*-----------------------------------------------------------*/