Case unused return values for memset and memcpy to void in stream_buffer.c to avoid...

Remove duplicate comment in heap_1.c.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2571 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/FreeRTOS/Source/portable/MemMang/heap_1.c b/FreeRTOS/Source/portable/MemMang/heap_1.c
index 54981d6cc2d77a219944a74756458144a85ca0de..d93f9107994eac0930e979870f783bb7c84af348 100644 (file)
--- a/FreeRTOS/Source/portable/MemMang/heap_1.c
+++ b/FreeRTOS/Source/portable/MemMang/heap_1.c
@@ -52,7 +52,6 @@ task.h is included from an application file. */
 /* A few bytes might be lost to byte aligning the heap start address. */\r
 #define configADJUSTED_HEAP_SIZE       ( configTOTAL_HEAP_SIZE - portBYTE_ALIGNMENT )\r
 \r
-/* Allocate the memory for the heap. */\r
 /* Allocate the memory for the heap. */\r
 #if( configAPPLICATION_ALLOCATED_HEAP == 1 )\r
        /* The application writer has already defined the array used for the RTOS\r

diff --git a/FreeRTOS/Source/stream_buffer.c b/FreeRTOS/Source/stream_buffer.c
index e5b565ed257317ce759a9727168b7c223fdfda06..fe4719373302be1206732fc40b7c8099377786b3 100644 (file)
--- a/FreeRTOS/Source/stream_buffer.c
+++ b/FreeRTOS/Source/stream_buffer.c
@@ -384,7 +384,7 @@ StreamBuffer_t * pxStreamBuffer = xStreamBuffer;
        {\r
                /* The structure and buffer were not allocated dynamically and cannot be\r
                freed - just scrub the structure so future use will assert. */\r
-               memset( pxStreamBuffer, 0x00, sizeof( StreamBuffer_t ) );\r
+               ( void ) memset( pxStreamBuffer, 0x00, sizeof( StreamBuffer_t ) );\r
        }\r
 }\r
 /*-----------------------------------------------------------*/\r
@@ -1100,7 +1100,7 @@ size_t xNextHead, xFirstLength;
 \r
        /* Write as many bytes as can be written in the first write. */\r
        configASSERT( ( xNextHead + xFirstLength ) <= pxStreamBuffer->xLength );\r
-       memcpy( ( void* ) ( &( pxStreamBuffer->pucBuffer[ xNextHead ] ) ), ( const void * ) pucData, xFirstLength ); /*lint !e9087 memcpy() requires void *. */\r
+       ( void ) memcpy( ( void* ) ( &( pxStreamBuffer->pucBuffer[ xNextHead ] ) ), ( const void * ) pucData, xFirstLength ); /*lint !e9087 memcpy() requires void *. */\r
 \r
        /* If the number of bytes written was less than the number that could be\r
        written in the first write... */\r
@@ -1108,7 +1108,7 @@ size_t xNextHead, xFirstLength;
        {\r
                /* ...then write the remaining bytes to the start of the buffer. */\r
                configASSERT( ( xCount - xFirstLength ) <= pxStreamBuffer->xLength );\r
-               memcpy( ( void * ) pxStreamBuffer->pucBuffer, ( const void * ) &( pucData[ xFirstLength ] ), xCount - xFirstLength ); /*lint !e9087 memcpy() requires void *. */\r
+               ( void ) memcpy( ( void * ) pxStreamBuffer->pucBuffer, ( const void * ) &( pucData[ xFirstLength ] ), xCount - xFirstLength ); /*lint !e9087 memcpy() requires void *. */\r
        }\r
        else\r
        {\r
@@ -1151,7 +1151,7 @@ size_t xCount, xFirstLength, xNextTail;
                read.  Asserts check bounds of read and write. */\r
                configASSERT( xFirstLength <= xMaxCount );\r
                configASSERT( ( xNextTail + xFirstLength ) <= pxStreamBuffer->xLength );\r
-               memcpy( ( void * ) pucData, ( const void * ) &( pxStreamBuffer->pucBuffer[ xNextTail ] ), xFirstLength ); /*lint !e9087 memcpy() requires void *. */\r
+               ( void ) memcpy( ( void * ) pucData, ( const void * ) &( pxStreamBuffer->pucBuffer[ xNextTail ] ), xFirstLength ); /*lint !e9087 memcpy() requires void *. */\r
 \r
                /* If the total number of wanted bytes is greater than the number\r
                that could be read in the first read... */\r
@@ -1159,7 +1159,7 @@ size_t xCount, xFirstLength, xNextTail;
                {\r
                        /*...then read the remaining bytes from the start of the buffer. */\r
                        configASSERT( xCount <= xMaxCount );\r
-                       memcpy( ( void * ) &( pucData[ xFirstLength ] ), ( void * ) ( pxStreamBuffer->pucBuffer ), xCount - xFirstLength ); /*lint !e9087 memcpy() requires void *. */\r
+                       ( void ) memcpy( ( void * ) &( pucData[ xFirstLength ] ), ( void * ) ( pxStreamBuffer->pucBuffer ), xCount - xFirstLength ); /*lint !e9087 memcpy() requires void *. */\r
                }\r
                else\r
                {\r
@@ -1225,7 +1225,7 @@ static void prvInitialiseNewStreamBuffer( StreamBuffer_t * const pxStreamBuffer,
        } /*lint !e529 !e438 xWriteValue is only used if configASSERT() is defined. */\r
        #endif\r
 \r
-       memset( ( void * ) pxStreamBuffer, 0x00, sizeof( StreamBuffer_t ) ); /*lint !e9087 memset() requires void *. */\r
+       ( void ) memset( ( void * ) pxStreamBuffer, 0x00, sizeof( StreamBuffer_t ) ); /*lint !e9087 memset() requires void *. */\r
        pxStreamBuffer->pucBuffer = pucBuffer;\r
        pxStreamBuffer->xLength = xBufferSizeBytes;\r
        pxStreamBuffer->xTriggerLevelBytes = xTriggerLevelBytes;\r