tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove the useless goto statements in PXE driver. 

Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>
Reviewed-by: Ouyang Qian <qian.ouyang@intel.com>

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14137 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
sfu5 2013-02-20 08:20:14 +00:00
parent 510ed4312f
commit 1ac9cb8a53
2 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
This implementation of EFI_PXE_BASE_CODE_PROTOCOL and EFI_LOAD_FILE_PROTOCOL. This implementation of EFI_PXE_BASE_CODE_PROTOCOL and EFI_LOAD_FILE_PROTOCOL.
Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR> Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
@ -428,10 +428,6 @@ EfiPxeBcDhcp (
// Start S.A.R.R. process to get a IPv6 address and other boot information. // Start S.A.R.R. process to get a IPv6 address and other boot information.
// //
Status = PxeBcDhcp6Sarr (Private, Private->Dhcp6); Status = PxeBcDhcp6Sarr (Private, Private->Dhcp6);
if (EFI_ERROR (Status)) {
goto ON_EXIT;
}
} else { } else {
// //
@ -443,13 +439,11 @@ EfiPxeBcDhcp (
// Start D.O.R.A. process to get a IPv4 address and other boot information. // Start D.O.R.A. process to get a IPv4 address and other boot information.
// //
Status = PxeBcDhcp4Dora (Private, Private->Dhcp4); Status = PxeBcDhcp4Dora (Private, Private->Dhcp4);
if (EFI_ERROR (Status)) {
goto ON_EXIT;
}
} }
ON_EXIT: //
// Reconfigure the UDP instance with the default configuration.
//
if (Mode->UsingIpv6) { if (Mode->UsingIpv6) {
Private->Udp6Read->Configure (Private->Udp6Read, &Private->Udp6CfgData); Private->Udp6Read->Configure (Private->Udp6Read, &Private->Udp6CfgData);
} else { } else {
@ -690,9 +684,7 @@ EfiPxeBcDiscover (
} }
} }
if (EFI_ERROR (Status)) { if (!EFI_ERROR (Status)) {
goto ON_EXIT;
} else {
// //
// Parse the cached PXE reply packet, and store it into mode data if valid. // Parse the cached PXE reply packet, and store it into mode data if valid.
// //
@ -964,11 +956,9 @@ EfiPxeBcMtftp (
Mode->IcmpErrorReceived = TRUE; Mode->IcmpErrorReceived = TRUE;
} }
if (EFI_ERROR (Status)) { //
goto ON_EXIT; // Reconfigure the UDP instance with the default configuration.
} //
ON_EXIT:
if (Mode->UsingIpv6) { if (Mode->UsingIpv6) {
Private->Udp6Read->Configure (Private->Udp6Read, &Private->Udp6CfgData); Private->Udp6Read->Configure (Private->Udp6Read, &Private->Udp6CfgData);
} else { } else {

10
NetworkPkg/UefiPxeBcDxe/PxeBcSupport.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
Support functions implementation for UefiPxeBc Driver. Support functions implementation for UefiPxeBc Driver.
Copyright (c) 2007 - 2011, Intel Corporation. All rights reserved.<BR> Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
@ -59,10 +59,6 @@ PxeBcFlushStaionIp (
} }
Status = Private->Ip6->Receive (Private->Ip6, &Private->Icmp6Token); Status = Private->Ip6->Receive (Private->Ip6, &Private->Icmp6Token);
if (EFI_ERROR (Status)) {
goto ON_EXIT;
}
} else { } else {
ASSERT (SubnetMask != NULL); ASSERT (SubnetMask != NULL);
CopyMem (&Private->Udp4CfgData.StationAddress, StationIp, sizeof (EFI_IPv4_ADDRESS)); CopyMem (&Private->Udp4CfgData.StationAddress, StationIp, sizeof (EFI_IPv4_ADDRESS));
@ -82,10 +78,6 @@ PxeBcFlushStaionIp (
} }
Status = Private->Ip4->Receive (Private->Ip4, &Private->IcmpToken); Status = Private->Ip4->Receive (Private->Ip4, &Private->IcmpToken);
if (EFI_ERROR (Status)) {
goto ON_EXIT;
}
} }
ON_EXIT: ON_EXIT: