Fix some errors detected by the GCC 4.4 compiler.

Signed-off-by: lpleahy
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13007 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/AppPkg/Applications/Sockets/DataSource/DataSource.c b/AppPkg/Applications/Sockets/DataSource/DataSource.c
index 31c38950a640ce3dd042be8a538fc7f9abd59577..44605c86e24875b2cc2eedbb1014c6d3c587a9dc 100644 (file)
--- a/AppPkg/Applications/Sockets/DataSource/DataSource.c
+++ b/AppPkg/Applications/Sockets/DataSource/DataSource.c
@@ -31,6 +31,7 @@
 #include <sys/socket.h>\r
 \r
 #include <stdio.h>\r
+#include <string.h>\r
 \r
 \r
 #define DATA_SAMPLE_SHIFT           5       ///<  Shift for number of samples\r

diff --git a/AppPkg/Applications/Sockets/GetHostByAddr/GetHostByAddr.c b/AppPkg/Applications/Sockets/GetHostByAddr/GetHostByAddr.c
index cec6b6c7c9af2e0b573c2de94191ad192ef64d1a..bb5841588ead450b393fa1b5877178cce396110f 100644 (file)
--- a/AppPkg/Applications/Sockets/GetHostByAddr/GetHostByAddr.c
+++ b/AppPkg/Applications/Sockets/GetHostByAddr/GetHostByAddr.c
@@ -73,7 +73,7 @@ main (
     IpAddress[1] = (UINT8)RemoteAddress[1];\r
     IpAddress[2] = (UINT8)RemoteAddress[2];\r
     IpAddress[3] = (UINT8)RemoteAddress[3];\r
-    pHost = gethostbyaddr ( &IpAddress[0], INADDRSZ, AF_INET );\r
+    pHost = gethostbyaddr ( (const char *)&IpAddress[0], INADDRSZ, AF_INET );\r
     if ( NULL == pHost ) {\r
       Print ( L"ERROR - host not found, h_errno: %d\r\n", h_errno );\r
     }\r

diff --git a/AppPkg/Applications/Sockets/GetNameInfo/GetNameInfo.c b/AppPkg/Applications/Sockets/GetNameInfo/GetNameInfo.c
index c9292e1fa70d588025480ec1332b79b59ad0721a..df5c2d6317d816e9ea57330707b9700da87d34c6 100644 (file)
--- a/AppPkg/Applications/Sockets/GetNameInfo/GetNameInfo.c
+++ b/AppPkg/Applications/Sockets/GetNameInfo/GetNameInfo.c
@@ -97,7 +97,7 @@ main (
         //\r
         //  Display this entry\r
         //\r
-        printf ( "%s: HostName\r\n", mHostName[0]);\r
+        printf ( "%s: HostName\r\n", &mHostName[0]);\r
         printf ( "%s: Service Name\r\n", &mServiceName[0]);\r
 \r
         //\r

diff --git a/AppPkg/Applications/Sockets/OobRx/OobRx.h b/AppPkg/Applications/Sockets/OobRx/OobRx.h
index 37730cada7de0119f5ffb3b0c5c39b42ccfa38fe..cd31ddc2d422b62b943e5f81e6421c99781947d5 100644 (file)
--- a/AppPkg/Applications/Sockets/OobRx/OobRx.h
+++ b/AppPkg/Applications/Sockets/OobRx/OobRx.h
@@ -45,6 +45,7 @@
 #include <Uefi.h>\r
 #include <errno.h>\r
 #include <stdlib.h>\r
+#include <string.h>\r
 \r
 #include <netinet/in.h>\r
 \r

diff --git a/AppPkg/Applications/Sockets/OobTx/OobTx.h b/AppPkg/Applications/Sockets/OobTx/OobTx.h
index d700d3e59f14d06a1d6c11ba0d82c84c175e11cc..ab8f39aa266018be3f97e43e7cc5091d2bf159d1 100644 (file)
--- a/AppPkg/Applications/Sockets/OobTx/OobTx.h
+++ b/AppPkg/Applications/Sockets/OobTx/OobTx.h
@@ -45,6 +45,7 @@
 #include <Uefi.h>\r
 #include <errno.h>\r
 #include <stdlib.h>\r
+#include <string.h>\r
 \r
 #include <netinet/in.h>\r
 \r

diff --git a/AppPkg/Applications/Sockets/RawIp4Rx/RawIp4Rx.h b/AppPkg/Applications/Sockets/RawIp4Rx/RawIp4Rx.h
index 679692c176ba265750c8be11454837324d55f04b..177222fc1729e0bf2462b407fdf455f91735e6ee 100644 (file)
--- a/AppPkg/Applications/Sockets/RawIp4Rx/RawIp4Rx.h
+++ b/AppPkg/Applications/Sockets/RawIp4Rx/RawIp4Rx.h
@@ -44,6 +44,7 @@
 #include <Uefi.h>\r
 #include <errno.h>\r
 #include <stdlib.h>\r
+#include <string.h>\r
 \r
 #include <netinet/in.h>\r
 \r

diff --git a/AppPkg/Applications/Sockets/RawIp4Tx/RawIp4Tx.h b/AppPkg/Applications/Sockets/RawIp4Tx/RawIp4Tx.h
index c37b718c5d40eb54084b8edbee5440299d0dae09..820ff58f0cdcf987249327ee80c04903fb2e79a6 100644 (file)
--- a/AppPkg/Applications/Sockets/RawIp4Tx/RawIp4Tx.h
+++ b/AppPkg/Applications/Sockets/RawIp4Tx/RawIp4Tx.h
@@ -45,6 +45,7 @@
 #include <Uefi.h>\r
 #include <errno.h>\r
 #include <stdlib.h>\r
+#include <string.h>\r
 \r
 #include <netinet/in.h>\r
 \r

diff --git a/AppPkg/Applications/Sockets/SetSockOpt/SetSockOpt.c b/AppPkg/Applications/Sockets/SetSockOpt/SetSockOpt.c
index dbecda35acb9ec706512f0ae89b0840779fc67d6..0df143a5144783ce9d8150725e13d938cc35bf7a 100644 (file)
--- a/AppPkg/Applications/Sockets/SetSockOpt/SetSockOpt.c
+++ b/AppPkg/Applications/Sockets/SetSockOpt/SetSockOpt.c
@@ -192,6 +192,9 @@ GetOptionValue (
   if ( pOption->bSetAllowed ) {\r
     Value.u8 = &mValue[0];\r
     switch ( pOption->DataType ) {\r
+    default:\r
+      break;\r
+\r
     case DATA_TYPE_INT32_DECIMAL:\r
       Values = sscanf ( pValue, "%d", Value.i32 );\r
       if ( 1 == Values ) {\r
@@ -201,7 +204,7 @@ GetOptionValue (
       break;\r
 \r
     case DATA_TYPE_TIMEVAL:\r
-      Values = sscanf ( pValue, "%d.%0d",\r
+      Values = sscanf ( pValue, "%d.%d",\r
                         &Value.TimeVal->tv_sec,\r
                         &Value.TimeVal->tv_usec );\r
       if (( 2 == Values )\r

diff --git a/AppPkg/Applications/Sockets/Sockets.inc b/AppPkg/Applications/Sockets/Sockets.inc
index 8b6bf8ed659f2c4a5e96880588160b599a440842..4aa8822038fb75bd5de06b4a44856f6dbdad1cce 100644 (file)
--- a/AppPkg/Applications/Sockets/Sockets.inc
+++ b/AppPkg/Applications/Sockets/Sockets.inc
@@ -22,9 +22,16 @@
   AppPkg/Applications/Sockets/RecvDgram/RecvDgram.inf\r
   AppPkg/Applications/Sockets/SetHostName/SetHostName.inf\r
   AppPkg/Applications/Sockets/SetSockOpt/SetSockOpt.inf\r
-  AppPkg/Applications/Sockets/TftpServer/TftpServer.inf\r
   AppPkg/Applications/Sockets/WebServer/WebServer.inf {\r
     <PcdsFixedAtBuild>\r
-      gStdLibTokenSpaceGuid.WebServer_HttpPort|80\r
+      gAppPkgTokenSpaceGuid.WebServer_HttpPort|80\r
   }\r
 \r
+################################################################################\r
+#  The following application requires TimerLib (platform specific library)\r
+################################################################################\r
+\r
+[Components]\r
+#  AppPkg/Applications/Sockets/TftpServer/TftpServer.inf\r
+\r
+\r

diff --git a/AppPkg/Applications/Sockets/TftpServer/TftpServer.c b/AppPkg/Applications/Sockets/TftpServer/TftpServer.c
index e9ab0dee5f059537d37dc1257a27273ed66a9dbb..30d9dae41da5cf17e20fb4a2dd09c5ebc74d952e 100644 (file)
--- a/AppPkg/Applications/Sockets/TftpServer/TftpServer.c
+++ b/AppPkg/Applications/Sockets/TftpServer/TftpServer.c
@@ -1781,9 +1781,9 @@ TftpRead (
     //\r
     //  Determine the file length\r
     //\r
-    pContext->File = fopen ( pFileName, pReadMode );\r
+    pContext->File = fopen ((const char *)pFileName, pReadMode );\r
     if (( NULL == pContext->File )\r
-        || ( -1 == stat ( pFileName, &FileStatus ))) {\r
+        || ( -1 == stat ((const char *)pFileName, &FileStatus ))) {\r
       //\r
       //  File not found\r
       //\r

diff --git a/AppPkg/Applications/Sockets/WebServer/ACPI.c b/AppPkg/Applications/Sockets/WebServer/ACPI.c
index c6caa1a568d2666e9e4d80aeaa308e0f216a78b3..18321d2b1289145a06d4b9efa07fab30b87b47da 100644 (file)
--- a/AppPkg/Applications/Sockets/WebServer/ACPI.c
+++ b/AppPkg/Applications/Sockets/WebServer/ACPI.c
@@ -28,7 +28,9 @@ Intel Corporation.
 #include <IndustryStandard/Acpi10.h>\r
 #include <IndustryStandard/Acpi30.h>\r
 \r
+#if defined(_MSC_VER)   //  Handle Microsoft VC++ compiler specifics.\r
 #pragma warning ( disable : 4305 )\r
+#endif  //  defined(_MSC_VER)\r
 \r
 //\r
 // Ensure proper structure formats\r
@@ -848,7 +850,7 @@ AcpiDsdtPage (
       Status = EFI_NOT_FOUND;\r
       break;\r
     }\r
-    pDsdt = (VOID *)pFadt->XDsdt;\r
+    pDsdt = (VOID *)(UINTN)pFadt->XDsdt;\r
 \r
     //\r
     //  Send the page and table header\r
@@ -895,7 +897,7 @@ AcpiDsdtPage (
                             pPort,\r
                             "OEMID",\r
                             sizeof ( pDsdt->OemId ),\r
-                            &pDsdt->OemId[ 0 ]);\r
+                            (CONST CHAR8 *)&pDsdt->OemId[ 0 ]);\r
     if ( EFI_ERROR ( Status )) {\r
       break;\r
     }\r
@@ -903,7 +905,7 @@ AcpiDsdtPage (
                             pPort,\r
                             "OEM Table ID",\r
                             sizeof ( pDsdt->OemTableId ),\r
-                            &pDsdt->OemTableId[ 0 ]);\r
+                            (CONST CHAR8 *)&pDsdt->OemTableId[ 0 ]);\r
     if ( EFI_ERROR ( Status )) {\r
       break;\r
     }\r
@@ -1039,7 +1041,7 @@ AcpiFadtPage (
                             pPort,\r
                             "OEMID",\r
                             sizeof ( pFadt->OemId ),\r
-                            &pFadt->OemId[ 0 ]);\r
+                            (CONST CHAR8 *)&pFadt->OemId[ 0 ]);\r
     if ( EFI_ERROR ( Status )) {\r
       break;\r
     }\r
@@ -1047,7 +1049,7 @@ AcpiFadtPage (
                             pPort,\r
                             "OEM Table ID",\r
                             sizeof ( pFadt->OemTableId ),\r
-                            &pFadt->OemTableId[ 0 ]);\r
+                            (CONST CHAR8 *)&pFadt->OemTableId[ 0 ]);\r
     if ( EFI_ERROR ( Status )) {\r
       break;\r
     }\r
@@ -1576,7 +1578,7 @@ AcpiRsdp10Page (
                             pPort,\r
                             "OemId",\r
                             sizeof ( pRsdp10b->OemId ),\r
-                            &pRsdp10b->OemId[ 0 ]);\r
+                            (CONST CHAR8 *)&pRsdp10b->OemId[ 0 ]);\r
     if ( EFI_ERROR ( Status )) {\r
       break;\r
     }\r
@@ -1679,7 +1681,7 @@ AcpiRsdp30Page (
                             pPort,\r
                             "OemId",\r
                             sizeof ( pRsdp30->OemId ),\r
-                            &pRsdp30->OemId[ 0 ]);\r
+                            (CONST CHAR8 *)&pRsdp30->OemId[ 0 ]);\r
     if ( EFI_ERROR ( Status )) {\r
       break;\r
     }\r
@@ -1709,7 +1711,7 @@ AcpiRsdp30Page (
     Status = RowPointer ( SocketFD,\r
                           pPort,\r
                           "XsdtAddress",\r
-                          (VOID *)pRsdp30->XsdtAddress,\r
+                          (VOID *)(UINTN)pRsdp30->XsdtAddress,\r
                           NULL );\r
     if ( EFI_ERROR ( Status )) {\r
       break;\r
@@ -1833,7 +1835,7 @@ AcpiRsdtPage (
                             pPort,\r
                             "OEMID",\r
                             sizeof ( pRsdt->OemId ),\r
-                            &pRsdt->OemId[ 0 ]);\r
+                            (CONST CHAR8 *)&pRsdt->OemId[ 0 ]);\r
     if ( EFI_ERROR ( Status )) {\r
       break;\r
     }\r
@@ -1841,7 +1843,7 @@ AcpiRsdtPage (
                             pPort,\r
                             "OEM Table ID",\r
                             sizeof ( pRsdt->OemTableId ),\r
-                            &pRsdt->OemTableId[ 0 ]);\r
+                            (CONST CHAR8 *)&pRsdt->OemTableId[ 0 ]);\r
     if ( EFI_ERROR ( Status )) {\r
       break;\r
     }\r

diff --git a/AppPkg/Applications/Sockets/WebServer/DhcpOptions.c b/AppPkg/Applications/Sockets/WebServer/DhcpOptions.c
index fe37d3deb703decae4d9b35e0cbe1379f6ef11b4..0a2e6cfde16b5da538f124dcede6eb37c9346151 100644 (file)
--- a/AppPkg/Applications/Sockets/WebServer/DhcpOptions.c
+++ b/AppPkg/Applications/Sockets/WebServer/DhcpOptions.c
@@ -151,7 +151,7 @@ DhcpOptionsPage (
           Status = gBS->OpenProtocol ( *pHandle,
 //                                       Dhcp4Handle,
                                        &gEfiDhcp4ProtocolGuid,
-                                       &pDhcp4,
+                                       (VOID **)&pDhcp4,
                                        NULL,
                                        gImageHandle,
                                        EFI_OPEN_PROTOCOL_GET_PROTOCOL );

diff --git a/AppPkg/Applications/Sockets/WebServer/HTTP.c b/AppPkg/Applications/Sockets/WebServer/HTTP.c
index 9a8bd70a9d62f71b5b464732c7357e19d8e97320..5237ac1a494940beea661949660884d964a7aa21 100644 (file)
--- a/AppPkg/Applications/Sockets/WebServer/HTTP.c
+++ b/AppPkg/Applications/Sockets/WebServer/HTTP.c
@@ -918,7 +918,7 @@ HttpSendDump (
       Status = HttpSendHexBits ( SocketFD,\r
                                  pPort,\r
                                  sizeof ( pData ) * 8,\r
-                                 (UINT64)pData );\r
+                                 (UINT64)(UINTN)pData );\r
       if ( EFI_ERROR ( Status )) {\r
         break;\r
       }\r
@@ -1663,25 +1663,25 @@ HttpSendValue (
   CONST UINT64 * pEnd;\r
   CONST UINT64 * pDivisor;\r
   CONST UINT64 pDivisors[ ] = {\r
-     10000000000000000000L,\r
-      1000000000000000000L,\r
-       100000000000000000L,\r
-        10000000000000000L,\r
-         1000000000000000L,\r
-          100000000000000L,\r
-           10000000000000L,\r
-            1000000000000L,\r
-             100000000000L,\r
-              10000000000L,\r
-               1000000000L,\r
-                100000000L,\r
-                 10000000L,\r
-                  1000000L,\r
-                   100000L,\r
-                    10000L,\r
-                     1000L,\r
-                      100L,\r
-                       10L\r
+     10000000000000000000ULL,\r
+      1000000000000000000ULL,\r
+       100000000000000000ULL,\r
+        10000000000000000ULL,\r
+         1000000000000000ULL,\r
+          100000000000000ULL,\r
+           10000000000000ULL,\r
+            1000000000000ULL,\r
+             100000000000ULL,\r
+              10000000000ULL,\r
+               1000000000ULL,\r
+                100000000ULL,\r
+                 10000000ULL,\r
+                  1000000ULL,\r
+                   100000ULL,\r
+                    10000ULL,\r
+                     1000ULL,\r
+                      100ULL,\r
+                       10ULL\r
   };\r
   EFI_STATUS Status;\r
   UINT64 Temp;\r

diff --git a/AppPkg/Applications/Sockets/WebServer/SystemTable.c b/AppPkg/Applications/Sockets/WebServer/SystemTable.c
index 0d2a1f204051240f3e5d4a6da3866d2af5b3bcfc..916c4b92b68bbfe4e6f90175990a2d02757fe817 100644 (file)
--- a/AppPkg/Applications/Sockets/WebServer/SystemTable.c
+++ b/AppPkg/Applications/Sockets/WebServer/SystemTable.c
@@ -358,7 +358,7 @@ RowPointer (
     Status = HttpSendHexBits ( SocketFD,
                                pPort,
                                sizeof ( pAddress ) * 8,
-                               (UINT64) pAddress );
+                               (UINT64)(UINTN)pAddress );
     if ( EFI_ERROR ( Status )) {
       break;
     }
@@ -586,7 +586,7 @@ TableHeader (
       Status = HttpSendHexBits ( SocketFD,
                                  pPort,
                                  sizeof ( pTable ) *  8,
-                                 (UINT64)pTable );
+                                 (UINT64)(UINTN)pTable );
       if ( EFI_ERROR ( Status )) {
         break;
       }

diff --git a/AppPkg/Applications/Sockets/WebServer/WebServer.h b/AppPkg/Applications/Sockets/WebServer/WebServer.h
index a5dcea49698ff9fd907ea74c622202f855571852..48839f345613ecacc227f2dbc225b71c0b61e923 100644 (file)
--- a/AppPkg/Applications/Sockets/WebServer/WebServer.h
+++ b/AppPkg/Applications/Sockets/WebServer/WebServer.h
@@ -34,8 +34,10 @@
 #include <sys/poll.h>\r
 #include <sys/socket.h>\r
 \r
+#if defined(_MSC_VER)   //  Handle Microsoft VC++ compiler specifics.\r
 #pragma warning ( disable : 4054 )\r
 #pragma warning ( disable : 4152 )\r
+#endif  //  defined(_MSC_VER)\r
 \r
 //------------------------------------------------------------------------------\r
 //  Pages\r