Partially make EdkModulePkg pass intel IPF compiler with /W4 /WX switched on.

[mirror_edk2.git] / EdkModulePkg / Universal / Network / PxeBc / Dxe / pxe_bc_dhcp.c

diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c
index 57664d81e2cc502d396a92485dc2a7b957ace5d2..bb7022ba749c2d3aa63120c39f780f3cbd82488e 100644 (file)
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c
@@ -211,7 +211,7 @@ OptionsStrucInit (
   CopyMem (DHCPOpStart.DhcpClassIdentifier.Data.UndiMajor, "yyy", sizeof ("yyy"));\r
   CopyMem (DHCPOpStart.DhcpClassIdentifier.Data.UndiMinor, "xxx", sizeof ("xxx"));\r
   DHCPOpStart.End[0] = OP_END;\r
-};\r
+}\r
 \r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
 \r
@@ -399,6 +399,7 @@ STATIC UINT8  OurDhcpOptions[MAX_OUR_OPT] = {
 #pragma pack()\r
 \r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
+STATIC\r
 CHAR8 *\r
 PxeBcLibGetSmbiosString (\r
   IN  SMBIOS_STRUCTURE_POINTER  *Smbios,\r
@@ -855,6 +856,7 @@ DecodeOptions (
 }\r
 \r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
+STATIC\r
 VOID\r
 Parse (\r
   DHCP_RECEIVE_BUFFER *RxBufPtr,\r
@@ -958,6 +960,7 @@ CopyParse (
 }\r
 \r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
+STATIC\r
 BOOLEAN\r
 AckEdit (\r
   DHCP_RECEIVE_BUFFER *DhcpRxBuf\r
@@ -984,6 +987,7 @@ AckEdit (
 //\r
 // if a discover type packet, make sure all required fields are present\r
 //\r
+STATIC\r
 BOOLEAN\r
 DHCPOfferAckEdit (\r
   DHCP_RECEIVE_BUFFER *DhcpRxBuf\r
@@ -1126,6 +1130,7 @@ DHCPOfferAckEdit (
 }\r
 \r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
+STATIC\r
 BOOLEAN\r
 DHCPAckEdit (\r
   DHCP_RECEIVE_BUFFER *RxBufPtr\r
@@ -1139,6 +1144,7 @@ DHCPAckEdit (
 //\r
 // get an offer/ack\r
 //\r
+STATIC\r
 EFI_STATUS\r
 GetOfferAck (\r
   PXE_BASECODE_DEVICE          *Private,\r
@@ -1249,6 +1255,7 @@ Returns:
 //\r
 // get DHCPOFFER's\r
 //\r
+STATIC\r
 EFI_STATUS\r
 GetOffers (\r
   PXE_BASECODE_DEVICE *Private\r
@@ -2146,6 +2153,7 @@ DoDhcpDora (
 //\r
 // determine if the server ip is in the ip list\r
 //\r
+STATIC\r
 BOOLEAN\r
 InServerList (\r
   EFI_IP_ADDRESS    *ServerIpPtr,\r
@@ -2172,6 +2180,7 @@ InServerList (
 }\r
 \r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
+STATIC\r
 BOOLEAN\r
 ExtractBootServerList (\r
   UINT16            Type,\r
@@ -2209,6 +2218,7 @@ ExtractBootServerList (
 }\r
 \r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
+STATIC\r
 VOID\r
 FreeMem (\r
   PXE_BASECODE_DEVICE *Private\r
@@ -2226,6 +2236,7 @@ FreeMem (
 }\r
 \r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
+STATIC\r
 BOOLEAN\r
 GetMem (\r
   PXE_BASECODE_DEVICE *Private\r
@@ -2443,6 +2454,7 @@ VerifyCredentialOption (
 }\r
 \r
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */\r
+STATIC\r
 EFI_STATUS\r
 DoDiscover (\r
   PXE_BASECODE_DEVICE *Private,\r
@@ -3210,13 +3222,11 @@ Returns:
 {\r
   EFI_PXE_BASE_CODE_MODE  *PxebcMode;\r
   EFI_STATUS              Status;\r
-  EFI_STATUS              StatCode;\r
   PXE_BASECODE_DEVICE     *Private;\r
 \r
   //\r
   // Lock the instance data and make sure started\r
   //\r
-  StatCode = EFI_SUCCESS;\r
 \r
   if (This == NULL) {\r
     DEBUG ((EFI_D_ERROR, "BC *This pointer == NULL"));\r