Fix compilation errors detected with GCC 4.4

[mirror_edk2.git] / StdLib / EfiSocketLib / Socket.c

diff --git a/StdLib/EfiSocketLib/Socket.c b/StdLib/EfiSocketLib/Socket.c
index 42e4689d0b836e3b3f37b27397938236885f0da6..9c2d2f684421273894b71333a9b6b5677f91b6dd 100644 (file)
--- a/StdLib/EfiSocketLib/Socket.c
+++ b/StdLib/EfiSocketLib/Socket.c
@@ -2307,7 +2307,7 @@ EslSocketIoInit (
   IN ESL_IO_MGMT ** ppFreeQueue,\r
   IN UINTN DebugFlags,\r
   IN CHAR8 * pEventName,\r
-  IN EFI_EVENT_NOTIFY pfnCompletion\r
+  IN PFN_API_IO_COMPLETE pfnCompletion\r
   )\r
 {\r
   ESL_IO_MGMT * pEnd;\r
@@ -2670,7 +2670,7 @@ EslSocketOptionGet (
   int errno;\r
   socklen_t LengthInBytes;\r
   socklen_t MaxBytes;\r
-  UINT8 * pOptionData;\r
+  CONST UINT8 * pOptionData;\r
   ESL_SOCKET * pSocket;\r
   EFI_STATUS Status;\r
 \r
@@ -2709,7 +2709,7 @@ EslSocketOptionGet (
         if ( pSocket->pApi->DefaultProtocol == level ) {\r
           Status = pSocket->pApi->pfnOptionGet ( pSocket,\r
                                                  OptionName,\r
-                                                 &pOptionData,\r
+                                                 (CONST void ** __restrict)&pOptionData,\r
                                                  &LengthInBytes );\r
           errno = pSocket->errno;\r
           break;\r
@@ -2749,7 +2749,7 @@ EslSocketOptionGet (
         //\r
         //  Return the listen flag\r
         //\r
-        pOptionData = (UINT8 *)&pSocket->bListenCalled;\r
+        pOptionData = (CONST UINT8 *)&pSocket->bListenCalled;\r
         LengthInBytes = sizeof ( pSocket->bListenCalled );\r
         break;\r
 \r
@@ -2757,7 +2757,7 @@ EslSocketOptionGet (
         //\r
         //  Return the debug flags\r
         //\r
-        pOptionData = (UINT8 *)&pSocket->bOobInLine;\r
+        pOptionData = (CONST UINT8 *)&pSocket->bOobInLine;\r
         LengthInBytes = sizeof ( pSocket->bOobInLine );\r
         break;\r
 \r
@@ -2765,7 +2765,7 @@ EslSocketOptionGet (
         //\r
         //  Return the out-of-band inline flag\r
         //\r
-        pOptionData = (UINT8 *)&pSocket->bOobInLine;\r
+        pOptionData = (CONST UINT8 *)&pSocket->bOobInLine;\r
         LengthInBytes = sizeof ( pSocket->bOobInLine );\r
         break;\r
 \r
@@ -2773,7 +2773,7 @@ EslSocketOptionGet (
         //\r
         //  Return the receive timeout\r
         //\r
-        pOptionData = (UINT8 *)&pSocket->RxTimeout;\r
+        pOptionData = (CONST UINT8 *)&pSocket->RxTimeout;\r
         LengthInBytes = sizeof ( pSocket->RxTimeout );\r
         break;\r
         \r
@@ -2781,7 +2781,7 @@ EslSocketOptionGet (
         //\r
         //  Return the maximum receive buffer size\r
         //\r
-        pOptionData = (UINT8 *)&pSocket->MaxRxBuf;\r
+        pOptionData = (CONST UINT8 *)&pSocket->MaxRxBuf;\r
         LengthInBytes = sizeof ( pSocket->MaxRxBuf );\r
         break;\r
 \r
@@ -2789,7 +2789,7 @@ EslSocketOptionGet (
         //\r
         //  Return the maximum transmit buffer size\r
         //\r
-        pOptionData = (UINT8 *)&pSocket->MaxTxBuf;\r
+        pOptionData = (CONST UINT8 *)&pSocket->MaxTxBuf;\r
         LengthInBytes = sizeof ( pSocket->MaxTxBuf );\r
         break;\r
 \r
@@ -2797,7 +2797,7 @@ EslSocketOptionGet (
         //\r
         //  Return the socket type\r
         //\r
-        pOptionData = (UINT8 *)&pSocket->Type;\r
+        pOptionData = (CONST UINT8 *)&pSocket->Type;\r
         LengthInBytes = sizeof ( pSocket->Type );\r
         break;\r
       }\r