From ece24799e5ec5de7a67acbc3c6e36905a93ecd3c Mon Sep 17 00:00:00 2001 From: abuthahirm Date: Fri, 27 Mar 2026 13:27:42 +0530 Subject: [PATCH] NetworkPkg: Remove redundant Status initializations Remove redundant Status = EFI_SUCCESS and Status = EFI_DEVICE_ERROR initializations that are immediately overwritten before being read, across multiple modules: Dhcp6Dxe, DnsDxe, HttpBootDxe, HttpDxe, Ip4Dxe, Ip6Dxe, MnpDxe, Mtftp4Dxe, Mtftp6Dxe, SnpDxe, TcpDxe, TlsAuthConfigDxe, UefiPxeBcDxe and WifiConnectionManagerDxe. Cc: Saloni Kasbekar Cc: Zachary Clark-williams Signed-off-by: abuthahirm --- NetworkPkg/Dhcp6Dxe/Dhcp6Io.c | 2 - NetworkPkg/DnsDxe/DnsDriver.c | 5 +- NetworkPkg/DnsDxe/DnsProtocol.c | 10 ---- NetworkPkg/HttpBootDxe/HttpBootImpl.c | 2 - NetworkPkg/HttpDxe/HttpProto.c | 1 - NetworkPkg/HttpDxe/HttpsSupport.c | 8 --- NetworkPkg/Ip4Dxe/Ip4Config2Impl.c | 58 +++++++++---------- NetworkPkg/Ip4Dxe/Ip4Config2Nv.c | 2 - NetworkPkg/Ip6Dxe/Ip6Nd.c | 1 - NetworkPkg/MnpDxe/MnpConfig.c | 10 +--- NetworkPkg/Mtftp4Dxe/Mtftp4Rrq.c | 3 - NetworkPkg/Mtftp6Dxe/Mtftp6Rrq.c | 3 - NetworkPkg/SnpDxe/Initialize.c | 2 - NetworkPkg/TcpDxe/SockInterface.c | 2 - .../TlsAuthConfigDxe/TlsAuthConfigImpl.c | 3 +- NetworkPkg/UefiPxeBcDxe/PxeBcBoot.c | 1 - NetworkPkg/UefiPxeBcDxe/PxeBcDhcp4.c | 7 +-- NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c | 2 - NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c | 4 -- NetworkPkg/UefiPxeBcDxe/PxeBcMtftp.c | 8 --- .../WifiConnectionMgrImpl.c | 2 - 21 files changed, 36 insertions(+), 100 deletions(-) diff --git a/NetworkPkg/Dhcp6Dxe/Dhcp6Io.c b/NetworkPkg/Dhcp6Dxe/Dhcp6Io.c index a9bffae353..34cf8473d3 100644 --- a/NetworkPkg/Dhcp6Dxe/Dhcp6Io.c +++ b/NetworkPkg/Dhcp6Dxe/Dhcp6Io.c @@ -2300,8 +2300,6 @@ Dhcp6HandleReplyMsg ( ASSERT (Instance->IaCb.Ia != NULL); ASSERT (Packet != NULL); - Status = EFI_SUCCESS; - if (Packet->Dhcp6.Header.MessageType != Dhcp6MsgReply) { return EFI_DEVICE_ERROR; } diff --git a/NetworkPkg/DnsDxe/DnsDriver.c b/NetworkPkg/DnsDxe/DnsDriver.c index 466c64046f..55eb263c83 100644 --- a/NetworkPkg/DnsDxe/DnsDriver.c +++ b/NetworkPkg/DnsDxe/DnsDriver.c @@ -236,8 +236,7 @@ DnsCreateService ( EFI_STATUS Status; DNS_SERVICE *DnsSb; - Status = EFI_SUCCESS; - DnsSb = NULL; + DnsSb = NULL; *Service = NULL; @@ -428,8 +427,6 @@ DnsDriverEntryPoint ( { EFI_STATUS Status; - Status = EFI_SUCCESS; - // // Install the Dns4 Driver Binding Protocol. // diff --git a/NetworkPkg/DnsDxe/DnsProtocol.c b/NetworkPkg/DnsDxe/DnsProtocol.c index 563c6ce723..fa049f7282 100644 --- a/NetworkPkg/DnsDxe/DnsProtocol.c +++ b/NetworkPkg/DnsDxe/DnsProtocol.c @@ -71,7 +71,6 @@ Dns4GetModeData ( ServerList = NULL; CacheItem = NULL; CacheList = NULL; - Status = EFI_SUCCESS; if ((This == NULL) || (DnsModeData == NULL)) { return EFI_INVALID_PARAMETER; @@ -354,7 +353,6 @@ Dns4HostNameToIp ( EFI_TPL OldTpl; - Status = EFI_SUCCESS; Item = NULL; QueryName = NULL; TokenEntry = NULL; @@ -611,7 +609,6 @@ Dns4GeneralLookUp ( EFI_TPL OldTpl; - Status = EFI_SUCCESS; TokenEntry = NULL; Packet = NULL; @@ -754,8 +751,6 @@ Dns4UpdateDnsCache ( EFI_STATUS Status; EFI_TPL OldTpl; - Status = EFI_SUCCESS; - if ((DnsCacheEntry.HostName == NULL) || (DnsCacheEntry.IpAddress == NULL) || (DnsCacheEntry.Timeout == 0)) { return EFI_INVALID_PARAMETER; } @@ -924,7 +919,6 @@ Dns6GetModeData ( ServerList = NULL; CacheItem = NULL; CacheList = NULL; - Status = EFI_SUCCESS; if ((This == NULL) || (DnsModeData == NULL)) { return EFI_INVALID_PARAMETER; @@ -1200,7 +1194,6 @@ Dns6HostNameToIp ( EFI_TPL OldTpl; - Status = EFI_SUCCESS; Item = NULL; QueryName = NULL; TokenEntry = NULL; @@ -1460,7 +1453,6 @@ Dns6GeneralLookUp ( EFI_TPL OldTpl; - Status = EFI_SUCCESS; TokenEntry = NULL; Packet = NULL; @@ -1604,8 +1596,6 @@ Dns6UpdateDnsCache ( EFI_STATUS Status; EFI_TPL OldTpl; - Status = EFI_SUCCESS; - if ((DnsCacheEntry.HostName == NULL) || (DnsCacheEntry.IpAddress == NULL) || (DnsCacheEntry.Timeout == 0)) { return EFI_INVALID_PARAMETER; } diff --git a/NetworkPkg/HttpBootDxe/HttpBootImpl.c b/NetworkPkg/HttpBootDxe/HttpBootImpl.c index a1696f67ec..00f1102eb6 100644 --- a/NetworkPkg/HttpBootDxe/HttpBootImpl.c +++ b/NetworkPkg/HttpBootDxe/HttpBootImpl.c @@ -313,8 +313,6 @@ HttpBootDhcp ( return EFI_NOT_STARTED; } - Status = EFI_DEVICE_ERROR; - if (!Private->UsingIpv6) { // // Start D.O.R.A process to get a IPv4 address and other boot information. diff --git a/NetworkPkg/HttpDxe/HttpProto.c b/NetworkPkg/HttpDxe/HttpProto.c index 312ba21789..9fac19a917 100644 --- a/NetworkPkg/HttpDxe/HttpProto.c +++ b/NetworkPkg/HttpDxe/HttpProto.c @@ -1521,7 +1521,6 @@ HttpTransmitTcp ( UINTN RecordCount; UINTN RemainingLen; - Status = EFI_SUCCESS; TlsRecord = NULL; PayloadSize = 0; TempFragment.Len = 0; diff --git a/NetworkPkg/HttpDxe/HttpsSupport.c b/NetworkPkg/HttpDxe/HttpsSupport.c index 24da1e6991..230cf9a39c 100644 --- a/NetworkPkg/HttpDxe/HttpsSupport.c +++ b/NetworkPkg/HttpDxe/HttpsSupport.c @@ -818,9 +818,6 @@ TlsCommonTransmit ( ); HttpInstance->Tcp4TlsTxToken.Packet.TxData = (EFI_TCP4_TRANSMIT_DATA *)Data; - - Status = EFI_DEVICE_ERROR; - // // Transmit the packet. // @@ -853,8 +850,6 @@ TlsCommonTransmit ( HttpInstance->Tcp6TlsTxToken.Packet.TxData = (EFI_TCP6_TRANSMIT_DATA *)Data; - Status = EFI_DEVICE_ERROR; - // // Transmit the packet. // @@ -1452,7 +1447,6 @@ TlsCloseSession ( NET_BUF *PacketOut; UINT8 *DataOut; - Status = EFI_SUCCESS; BufferOut = NULL; PacketOut = NULL; DataOut = NULL; @@ -1574,7 +1568,6 @@ TlsProcessMessage ( EFI_TLS_FRAGMENT_DATA *OriginalFragmentTable; UINTN Index; - Status = EFI_SUCCESS; Buffer = NULL; BufferSize = 0; BytesCopied = 0; @@ -1704,7 +1697,6 @@ HttpsReceive ( UINT8 *GetSessionDataBuffer; UINTN GetSessionDataBufferSize; - Status = EFI_SUCCESS; Pdu = NULL; BufferIn = NULL; BufferInSize = 0; diff --git a/NetworkPkg/Ip4Dxe/Ip4Config2Impl.c b/NetworkPkg/Ip4Dxe/Ip4Config2Impl.c index 4d946cb6a9..98d44ac544 100644 --- a/NetworkPkg/Ip4Dxe/Ip4Config2Impl.c +++ b/NetworkPkg/Ip4Dxe/Ip4Config2Impl.c @@ -947,16 +947,7 @@ Ip4StartAutoConfig ( EFI_OPEN_PROTOCOL_BY_DRIVER ); if (EFI_ERROR (Status)) { - NetLibDestroyServiceChild ( - IpSb->Controller, - IpSb->Image, - &gEfiDhcp4ServiceBindingProtocolGuid, - Instance->Dhcp4Handle - ); - - Instance->Dhcp4Handle = NULL; - - return Status; + goto Error; } // @@ -965,6 +956,10 @@ Ip4StartAutoConfig ( // Dhcp4 = Instance->Dhcp4; Status = Dhcp4->GetModeData (Dhcp4, &Dhcp4Mode); + if (EFI_ERROR (Status)) { + goto Error; + } + if (Dhcp4Mode.State == Dhcp4Bound) { Ip4Config2OnDhcp4Complete (NULL, Instance); @@ -987,25 +982,7 @@ Ip4StartAutoConfig ( Status = Dhcp4->Configure (Dhcp4, &Dhcp4Mode.ConfigData); if (EFI_ERROR (Status)) { - gBS->CloseProtocol ( - Instance->Dhcp4Handle, - &gEfiDhcp4ProtocolGuid, - IpSb->Image, - IpSb->Controller - ); - - NetLibDestroyServiceChild ( - IpSb->Controller, - IpSb->Image, - &gEfiDhcp4ServiceBindingProtocolGuid, - Instance->Dhcp4Handle - ); - - Instance->Dhcp4 = NULL; - - Instance->Dhcp4Handle = NULL; - - return Status; + goto Error; } // @@ -1036,6 +1013,29 @@ Ip4StartAutoConfig ( DispatchDpc (); return EFI_SUCCESS; + +Error: + if (Instance->Dhcp4 != NULL) { + gBS->CloseProtocol ( + Instance->Dhcp4Handle, + &gEfiDhcp4ProtocolGuid, + IpSb->Image, + IpSb->Controller + ); + + Instance->Dhcp4 = NULL; + } + + NetLibDestroyServiceChild ( + IpSb->Controller, + IpSb->Image, + &gEfiDhcp4ServiceBindingProtocolGuid, + Instance->Dhcp4Handle + ); + + Instance->Dhcp4Handle = NULL; + + return Status; } /** diff --git a/NetworkPkg/Ip4Dxe/Ip4Config2Nv.c b/NetworkPkg/Ip4Dxe/Ip4Config2Nv.c index 8c6dbd5307..86833561e4 100644 --- a/NetworkPkg/Ip4Dxe/Ip4Config2Nv.c +++ b/NetworkPkg/Ip4Dxe/Ip4Config2Nv.c @@ -535,7 +535,6 @@ Ip4Config2ConvertIfrNvDataToConfigNvData ( UINTN DataSize; EFI_INPUT_KEY Key; - Status = EFI_SUCCESS; Ip4Cfg2 = &Instance->Ip4Config2; Ip4NvData = &Instance->Ip4NvData; @@ -878,7 +877,6 @@ Ip4FormExtractConfig ( return EFI_INVALID_PARAMETER; } - Status = EFI_SUCCESS; IfrFormNvData = NULL; ConfigRequest = NULL; FormResult = NULL; diff --git a/NetworkPkg/Ip6Dxe/Ip6Nd.c b/NetworkPkg/Ip6Dxe/Ip6Nd.c index 72aa45c10f..aa5770134e 100644 --- a/NetworkPkg/Ip6Dxe/Ip6Nd.c +++ b/NetworkPkg/Ip6Dxe/Ip6Nd.c @@ -1001,7 +1001,6 @@ Ip6InitDADProcess ( return EFI_SUCCESS; } - Status = EFI_SUCCESS; IpSb = IpIf->Service; DadXmits = &IpSb->Ip6ConfigInstance.DadXmits; diff --git a/NetworkPkg/MnpDxe/MnpConfig.c b/NetworkPkg/MnpDxe/MnpConfig.c index d0e3f823d2..5b2a80a35c 100644 --- a/NetworkPkg/MnpDxe/MnpConfig.c +++ b/NetworkPkg/MnpDxe/MnpConfig.c @@ -1199,8 +1199,6 @@ MnpStart ( MNP_DEVICE_DATA *MnpDeviceData; NET_CHECK_SIGNATURE (MnpServiceData, MNP_SERVICE_DATA_SIGNATURE); - - Status = EFI_SUCCESS; MnpDeviceData = MnpServiceData->MnpDeviceData; if (!IsConfigUpdate) { @@ -1330,19 +1328,19 @@ MnpStop ( // // The system poll in on, cancel the poll timer. // - Status = gBS->SetTimer (MnpDeviceData->PollTimer, TimerCancel, 0); + gBS->SetTimer (MnpDeviceData->PollTimer, TimerCancel, 0); MnpDeviceData->EnableSystemPoll = FALSE; } // // Cancel the timeout timer. // - Status = gBS->SetTimer (MnpDeviceData->TimeoutCheckTimer, TimerCancel, 0); + gBS->SetTimer (MnpDeviceData->TimeoutCheckTimer, TimerCancel, 0); // // Cancel the media detect timer. // - Status = gBS->SetTimer (MnpDeviceData->MediaDetectTimer, TimerCancel, 0); + gBS->SetTimer (MnpDeviceData->MediaDetectTimer, TimerCancel, 0); // // Stop the simple network. @@ -1422,8 +1420,6 @@ MnpConfigureInstance ( return EFI_UNSUPPORTED; } - Status = EFI_SUCCESS; - MnpServiceData = Instance->MnpServiceData; MnpDeviceData = MnpServiceData->MnpDeviceData; NET_CHECK_SIGNATURE (MnpDeviceData, MNP_DEVICE_DATA_SIGNATURE); diff --git a/NetworkPkg/Mtftp4Dxe/Mtftp4Rrq.c b/NetworkPkg/Mtftp4Dxe/Mtftp4Rrq.c index 75aaa80617..27d23b5e2c 100644 --- a/NetworkPkg/Mtftp4Dxe/Mtftp4Rrq.c +++ b/NetworkPkg/Mtftp4Dxe/Mtftp4Rrq.c @@ -91,8 +91,6 @@ Mtftp4RrqSendAck ( NET_BUF *Packet; EFI_STATUS Status; - Status = EFI_SUCCESS; - Packet = NetbufAlloc (sizeof (EFI_MTFTP4_ACK_HEADER)); if (Packet == NULL) { return EFI_OUT_OF_RESOURCES; @@ -252,7 +250,6 @@ Mtftp4RrqHandleData ( INTN Expected; *Completed = FALSE; - Status = EFI_SUCCESS; BlockNum = NTOHS (Packet->Data.Block); Expected = Mtftp4GetNextBlockNum (&Instance->Blocks); diff --git a/NetworkPkg/Mtftp6Dxe/Mtftp6Rrq.c b/NetworkPkg/Mtftp6Dxe/Mtftp6Rrq.c index 32327de69e..23575ba6fa 100644 --- a/NetworkPkg/Mtftp6Dxe/Mtftp6Rrq.c +++ b/NetworkPkg/Mtftp6Dxe/Mtftp6Rrq.c @@ -30,8 +30,6 @@ Mtftp6RrqSendAck ( NET_BUF *Packet; EFI_STATUS Status; - Status = EFI_SUCCESS; - // // Allocate net buffer to create ack packet. // @@ -222,7 +220,6 @@ Mtftp6RrqHandleData ( INTN Expected; *IsCompleted = FALSE; - Status = EFI_SUCCESS; BlockNum = NTOHS (Packet->Data.Block); Expected = Mtftp6GetNextBlockNum (&Instance->BlkList); diff --git a/NetworkPkg/SnpDxe/Initialize.c b/NetworkPkg/SnpDxe/Initialize.c index 1e2ed67ead..ffd914623c 100644 --- a/NetworkPkg/SnpDxe/Initialize.c +++ b/NetworkPkg/SnpDxe/Initialize.c @@ -35,8 +35,6 @@ PxeInit ( return EFI_DEVICE_ERROR; } - Status = EFI_SUCCESS; - Cpb = Snp->Cpb; if (Snp->TxRxBufferSize != 0) { Status = Snp->PciIo->AllocateBuffer ( diff --git a/NetworkPkg/TcpDxe/SockInterface.c b/NetworkPkg/TcpDxe/SockInterface.c index 6e8cbb74a8..07c92d4e0d 100644 --- a/NetworkPkg/TcpDxe/SockInterface.c +++ b/NetworkPkg/TcpDxe/SockInterface.c @@ -941,8 +941,6 @@ SockCancel ( { EFI_STATUS Status; - Status = EFI_SUCCESS; - ASSERT (SockStream == Sock->Type); Status = EfiAcquireLockOrFail (&(Sock->Lock)); diff --git a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c b/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c index 745155e6d7..370723df9c 100644 --- a/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c +++ b/NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigImpl.c @@ -1397,8 +1397,7 @@ TlsAuthConfigAccessCallback ( EFI_HII_POPUP_PROTOCOL *HiiPopUp; EFI_HII_POPUP_SELECTION PopUpSelect; - Status = EFI_SUCCESS; - File = NULL; + File = NULL; if ((This == NULL) || (Value == NULL) || (ActionRequest == NULL)) { return EFI_INVALID_PARAMETER; diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcBoot.c b/NetworkPkg/UefiPxeBcDxe/PxeBcBoot.c index 431a5effea..29cf03892f 100644 --- a/NetworkPkg/UefiPxeBcDxe/PxeBcBoot.c +++ b/NetworkPkg/UefiPxeBcDxe/PxeBcBoot.c @@ -610,7 +610,6 @@ PxeBcDhcp6BootInfo ( PxeBc = &Private->PxeBc; Mode = PxeBc->Mode; - Status = EFI_SUCCESS; *BufferSize = 0; // diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp4.c b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp4.c index 452038c219..0bca92c8ad 100644 --- a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp4.c +++ b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp4.c @@ -1387,9 +1387,8 @@ PxeBcDhcp4Discover ( return Status; } - Mode = Private->PxeBc.Mode; - Dhcp4 = Private->Dhcp4; - Status = EFI_SUCCESS; + Mode = Private->PxeBc.Mode; + Dhcp4 = Private->Dhcp4; ZeroMem (&Token, sizeof (EFI_DHCP4_TRANSMIT_RECEIVE_TOKEN)); @@ -1668,8 +1667,6 @@ PxeBcDhcp4Dora ( EFI_STATUS Status; ASSERT (Dhcp4 != NULL); - - Status = EFI_SUCCESS; PxeMode = Private->PxeBc.Mode; // diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c index bcabbd2219..804335a2b4 100644 --- a/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c +++ b/NetworkPkg/UefiPxeBcDxe/PxeBcDhcp6.c @@ -1710,7 +1710,6 @@ PxeBcRegisterIp6Address ( EFI_IPv6_ADDRESS *Ip6Addr; UINTN Index; - Status = EFI_SUCCESS; MappedEvt = NULL; Ip6Addr = NULL; DataSize = sizeof (EFI_IP6_CONFIG_POLICY); @@ -2352,7 +2351,6 @@ PxeBcDhcp6Sarr ( UINTN DataSize; EFI_IP6_CONFIG_DUP_ADDR_DETECT_TRANSMITS DadXmits; - Status = EFI_SUCCESS; PxeMode = Private->PxeBc.Mode; Ip6Cfg = Private->Ip6Cfg; Timer = NULL; diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c b/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c index d3f6c246bf..4e37944b43 100644 --- a/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c +++ b/NetworkPkg/UefiPxeBcDxe/PxeBcImpl.c @@ -435,7 +435,6 @@ EfiPxeBcDhcp ( return EFI_INVALID_PARAMETER; } - Status = EFI_SUCCESS; Private = PXEBC_PRIVATE_DATA_FROM_PXEBC (This); Mode = Private->PxeBc.Mode; Mode->IcmpErrorReceived = FALSE; @@ -2041,8 +2040,6 @@ EfiPxeBcSetStationIP ( Private = PXEBC_PRIVATE_DATA_FROM_PXEBC (This); Mode = Private->PxeBc.Mode; - Status = EFI_SUCCESS; - if (!Mode->UsingIpv6 && (NewSubnetMask != NULL) && !IP4_IS_VALID_NETMASK (NTOHL (NewSubnetMask->Addr[0]))) @@ -2381,7 +2378,6 @@ EfiPxeLoadFile ( Private = VirtualNic->Private; PxeBc = &Private->PxeBc; UsingIpv6 = FALSE; - Status = EFI_DEVICE_ERROR; // // Check media status before PXE start diff --git a/NetworkPkg/UefiPxeBcDxe/PxeBcMtftp.c b/NetworkPkg/UefiPxeBcDxe/PxeBcMtftp.c index f0042b85bf..de181b1664 100644 --- a/NetworkPkg/UefiPxeBcDxe/PxeBcMtftp.c +++ b/NetworkPkg/UefiPxeBcDxe/PxeBcMtftp.c @@ -131,7 +131,6 @@ PxeBcMtftp6GetFileSize ( EFI_STATUS Status; *BufferSize = 0; - Status = EFI_DEVICE_ERROR; Mtftp6 = Private->Mtftp6; Packet = NULL; Option = NULL; @@ -274,7 +273,6 @@ PxeBcMtftp6ReadFile ( UINT8 WindowsizeBuf[10]; EFI_STATUS Status; - Status = EFI_DEVICE_ERROR; Mtftp6 = Private->Mtftp6; OptCnt = 0; Config->InitialServerPort = PXEBC_BS_DOWNLOAD_PORT; @@ -363,7 +361,6 @@ PxeBcMtftp6WriteFile ( UINT8 OptBuf[128]; EFI_STATUS Status; - Status = EFI_DEVICE_ERROR; Mtftp6 = Private->Mtftp6; OptCnt = 0; Config->InitialServerPort = PXEBC_BS_DOWNLOAD_PORT; @@ -441,7 +438,6 @@ PxeBcMtftp6ReadDirectory ( UINT8 WindowsizeBuf[10]; EFI_STATUS Status; - Status = EFI_DEVICE_ERROR; Mtftp6 = Private->Mtftp6; OptCnt = 0; Config->InitialServerPort = PXEBC_BS_DOWNLOAD_PORT; @@ -610,7 +606,6 @@ PxeBcMtftp4GetFileSize ( EFI_STATUS Status; *BufferSize = 0; - Status = EFI_DEVICE_ERROR; Mtftp4 = Private->Mtftp4; Packet = NULL; Option = NULL; @@ -753,7 +748,6 @@ PxeBcMtftp4ReadFile ( UINT8 WindowsizeBuf[10]; EFI_STATUS Status; - Status = EFI_DEVICE_ERROR; Mtftp4 = Private->Mtftp4; OptCnt = 0; Config->InitialServerPort = PXEBC_BS_DOWNLOAD_PORT; @@ -842,7 +836,6 @@ PxeBcMtftp4WriteFile ( UINT8 OptBuf[128]; EFI_STATUS Status; - Status = EFI_DEVICE_ERROR; Mtftp4 = Private->Mtftp4; OptCnt = 0; Config->InitialServerPort = PXEBC_BS_DOWNLOAD_PORT; @@ -920,7 +913,6 @@ PxeBcMtftp4ReadDirectory ( UINT8 WindowsizeBuf[10]; EFI_STATUS Status; - Status = EFI_DEVICE_ERROR; Mtftp4 = Private->Mtftp4; OptCnt = 0; Config->InitialServerPort = PXEBC_BS_DOWNLOAD_PORT; diff --git a/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrImpl.c b/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrImpl.c index 072707faee..cdb193dc28 100644 --- a/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrImpl.c +++ b/NetworkPkg/WifiConnectionManagerDxe/WifiConnectionMgrImpl.c @@ -267,7 +267,6 @@ WifiMgrStartScan ( Nic->ScanState = WifiMgrScanning; OldTpl = gBS->RaiseTPL (TPL_CALLBACK); - Status = EFI_SUCCESS; HiddenSSIdList = NULL; HiddenSSIdCount = Nic->Private->HiddenNetworkCount; HiddenSSIdIndex = 0; @@ -1399,7 +1398,6 @@ WifiMgrDisconnectToNetwork ( } OldTpl = gBS->RaiseTPL (TPL_CALLBACK); - Status = EFI_SUCCESS; ConfigToken = AllocateZeroPool (sizeof (WIFI_MGR_MAC_CONFIG_TOKEN)); if (ConfigToken == NULL) { gBS->RestoreTPL (OldTpl);