MdeModulePkg/UefiBootManagerLib: fix crash on uninitialized ExitData

[mirror_edk2.git] / NetworkPkg / IpSecDxe / IpSecDriver.c

diff --git a/NetworkPkg/IpSecDxe/IpSecDriver.c b/NetworkPkg/IpSecDxe/IpSecDriver.c
index d8282b5e2fdab6c8d1732c238d31bfbe5bb735d8..916b0b24de0ed58f606923ac343fa1cf50f0c38a 100644 (file)
--- a/NetworkPkg/IpSecDxe/IpSecDriver.c
+++ b/NetworkPkg/IpSecDxe/IpSecDriver.c
@@ -1,15 +1,9 @@
 /** @file\r
   Driver Binding Protocol for IPsec Driver.\r
 \r
-  Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>\r
 \r
-  This program and the accompanying materials\r
-  are licensed and made available under the terms and conditions of the BSD License\r
-  which accompanies this distribution.  The full text of the license may be found at\r
-  http://opensource.org/licenses/bsd-license.php.\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -28,7 +22,7 @@
   @param[in]  RemainingDevicePath  Optional parameter used to pick a specific child\r
                                    device to start.\r
   @param[in]  IpVersion            IP_VERSION_4 or IP_VERSION_6.\r
-  \r
+\r
   @retval EFI_SUCCES           This driver supports this device.\r
   @retval EFI_ALREADY_STARTED  This driver is already running on this device.\r
   @retval other                This driver does not support this device.\r
@@ -45,7 +39,7 @@ IpSecSupported (
 {\r
   EFI_STATUS  Status;\r
   EFI_GUID    *UdpServiceBindingGuid;\r
-  \r
+\r
   if (IpVersion == IP_VERSION_4) {\r
     UdpServiceBindingGuid  = &gEfiUdp4ServiceBindingProtocolGuid;\r
   } else {\r
@@ -213,7 +207,7 @@ IpSecStop (
     //\r
     if (!IsListEmpty (&Private->Ikev2EstablishedList)) {\r
       NET_LIST_FOR_EACH_SAFE (Entry, Next, &Private->Ikev2EstablishedList) {\r
-        Ikev2SaSession = IKEV2_SA_SESSION_BY_SESSION (Entry); \r
+        Ikev2SaSession = IKEV2_SA_SESSION_BY_SESSION (Entry);\r
         RemoveEntryList (&Ikev2SaSession->BySessionTable);\r
         Ikev2SaSessionFree (Ikev2SaSession);\r
       }\r
@@ -631,16 +625,11 @@ IpSecDriverEntryPoint (
   return Status;\r
 \r
 ON_UNINSTALL_IPSEC4_DB:\r
-  gBS->UninstallMultipleProtocolInterfaces (\r
-         ImageHandle,\r
-         &gEfiDriverBindingProtocolGuid,\r
-         &gIpSec4DriverBinding,\r
-         &gEfiComponentName2ProtocolGuid,\r
-         &gIpSecComponentName2,\r
-         &gEfiComponentNameProtocolGuid,\r
-         &gIpSecComponentName,\r
-         NULL\r
-         );\r
+  EfiLibUninstallDriverBindingComponentName2 (\r
+    &gIpSec4DriverBinding,\r
+    &gIpSecComponentName,\r
+    &gIpSecComponentName2\r
+    );\r
 \r
 ON_UNINSTALL_IPSEC:\r
   gBS->UninstallProtocolInterface (\r