Update version number in readiness for V10.3.0 release. Sync SVN with reviewed releas...

[freertos] / FreeRTOS / Demo / ARM7_LPC2368_Rowley / webserver / httpd-cgi.c

diff --git a/FreeRTOS/Demo/ARM7_LPC2368_Rowley/webserver/httpd-cgi.c b/FreeRTOS/Demo/ARM7_LPC2368_Rowley/webserver/httpd-cgi.c
index fb87c478f0b6352e98611aef59dcd9fa9f9eea6e..a1de4e887db4887d86605ffef1f4dbb33a8b98ef 100644 (file)
--- a/FreeRTOS/Demo/ARM7_LPC2368_Rowley/webserver/httpd-cgi.c
+++ b/FreeRTOS/Demo/ARM7_LPC2368_Rowley/webserver/httpd-cgi.c
@@ -61,7 +61,7 @@ HTTPD_CGI_CALL(rtos, "rtos-stats", rtos_stats );
 HTTPD_CGI_CALL(io, "led-io", led_io );\r
 \r
 \r
-static const struct httpd_cgi_call *calls[] = { &file, &tcp, &net, &rtos, &io, NULL };\r
+static const struct httpd_cgi_call * const calls[] = { &file, &tcp, &net, &rtos, &io, NULL };\r
 \r
 /*---------------------------------------------------------------------------*/\r
 static\r
@@ -98,7 +98,7 @@ PT_THREAD(file_stats(struct httpd_state *s, char *ptr))
   PSOCK_BEGIN(&s->sout);\r
 \r
   PSOCK_GENERATOR_SEND(&s->sout, generate_file_stats, strchr(ptr, ' ') + 1);\r
-  \r
+\r
   PSOCK_END(&s->sout);\r
 }\r
 /*---------------------------------------------------------------------------*/\r
@@ -139,14 +139,14 @@ static const char *states[] = {
   closing,\r
   time_wait,\r
   last_ack};\r
-  \r
+\r
 \r
 static unsigned short\r
 generate_tcp_stats(void *arg)\r
 {\r
   struct uip_conn *conn;\r
   struct httpd_state *s = (struct httpd_state *)arg;\r
-    \r
+\r
   conn = &uip_conns[s->count];\r
   return snprintf((char *)uip_appdata, UIP_APPDATA_SIZE,\r
                 "<tr><td>%d</td><td>%u.%u.%u.%u:%u</td><td>%s</td><td>%u</td><td>%u</td><td>%c %c</td></tr>\r\n",\r
@@ -166,7 +166,7 @@ generate_tcp_stats(void *arg)
 static\r
 PT_THREAD(tcp_stats(struct httpd_state *s, char *ptr))\r
 {\r
-  \r
+\r
   PSOCK_BEGIN(&s->sout);\r
 \r
   for(s->count = 0; s->count < UIP_CONNS; ++s->count) {\r
@@ -197,14 +197,14 @@ PT_THREAD(net_stats(struct httpd_state *s, char *ptr))
       ++s->count) {\r
     PSOCK_GENERATOR_SEND(&s->sout, generate_net_stats, s);\r
   }\r
-  \r
+\r
 #endif /* UIP_STATISTICS */\r
-  \r
+\r
   PSOCK_END(&s->sout);\r
 }\r
 /*---------------------------------------------------------------------------*/\r
 \r
-extern void vTaskList( signed char *pcWriteBuffer );\r
+extern void vTaskList( char *pcWriteBuffer );\r
 static char cCountBuf[ 32 ];\r
 long lRefreshCount = 0;\r
 static unsigned short\r
@@ -212,9 +212,9 @@ generate_rtos_stats(void *arg)
 {\r
        lRefreshCount++;\r
        sprintf( cCountBuf, "<p><br>Refresh count = %d", lRefreshCount );\r
-    vTaskList( uip_appdata );\r
+    vTaskList( ( char * ) uip_appdata );\r
        strcat( uip_appdata, cCountBuf );\r
-  \r
+\r
        return strlen( uip_appdata );\r
 }\r
 /*---------------------------------------------------------------------------*/\r
@@ -224,7 +224,7 @@ static
 PT_THREAD(rtos_stats(struct httpd_state *s, char *ptr))\r
 {\r
   PSOCK_BEGIN(&s->sout);\r
-  PSOCK_GENERATOR_SEND(&s->sout, generate_rtos_stats, NULL);  \r
+  PSOCK_GENERATOR_SEND(&s->sout, generate_rtos_stats, NULL);\r
   PSOCK_END(&s->sout);\r
 }\r
 /*---------------------------------------------------------------------------*/\r
@@ -253,8 +253,8 @@ static unsigned short generate_io_state( void *arg )
                "<input type=\"checkbox\" name=\"LED2\" value=\"1\" %s>LED 2.7"\\r
                "<p>"\\r
                "<input type=\"text\" name=\"LCD\" value=\"Enter LCD text\" size=\"16\">",\r
-               pcStatus[ 0 ], \r
-               pcStatus[ 1 ], \r
+               pcStatus[ 0 ],\r
+               pcStatus[ 1 ],\r
                pcStatus[ 2 ] );\r
 \r
        return strlen( uip_appdata );\r