1. Enable Network stack to pass SCT, currently MNP, ARP, IP4, TCP4 and DHCP4 have...

[mirror_edk2.git] / MdeModulePkg / Universal / Network / PxeBcDxe / Pxe_bc_dhcp.c

diff --git a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c
index 7dec5ec2d217f4f0e47015bb90fc9f5670e18c40..d0eb98cfb79eab33542151f703bf61fe7a1d599d 100644 (file)
--- a/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c
+++ b/MdeModulePkg/Universal/Network/PxeBcDxe/Pxe_bc_dhcp.c
@@ -214,7 +214,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
@@ -883,7 +883,7 @@ Parse (
   } else if (!RxBufPtr->OpAdds.PktOptAdds[OP_DHCP_BOOTFILE_IX - 1] && RxBufPtr->u.Dhcpv4.file[0]) {\r
     RxBufPtr->OpAdds.PktOptAdds[OP_DHCP_BOOTFILE_IX - 1] = (DHCPV4_OP_STRUCT *) (RxBufPtr->u.Dhcpv4.file - sizeof (DHCPV4_OP_HEADER));\r
 \r
-    RxBufPtr->OpAdds.PktOptAdds[OP_DHCP_BOOTFILE_IX - 1]->Header.Length = (UINT8) AsciiStrLen (RxBufPtr->u.Dhcpv4.file);\r
+    RxBufPtr->OpAdds.PktOptAdds[OP_DHCP_BOOTFILE_IX - 1]->Header.Length = (UINT8) AsciiStrLen ((CHAR8 *) RxBufPtr->u.Dhcpv4.file);\r
   }\r
 \r
   LocalPtr.OpPtr = RxBufPtr->OpAdds.PktOptAdds[OP_DHCP_CLASS_IDENTIFIER_IX - 1];\r
@@ -3169,13 +3169,11 @@ BcSetPackets (
 {\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 ((DEBUG_ERROR, "BC *This pointer == NULL"));\r