1) Initialize gBS, gST, gImageHandle in UefiBootServicesTableLib.c to NULL

[mirror_edk2.git] / EdkModulePkg / Core / Dxe / Hand / handle.c

diff --git a/EdkModulePkg/Core/Dxe/Hand/handle.c b/EdkModulePkg/Core/Dxe/Hand/handle.c
index 2edfdeb78b8ab8d2828d66e7f34ba763b436fb71..dd0801a96f85658fdc8649f264ff331f5d9fd530 100644 (file)
--- a/EdkModulePkg/Core/Dxe/Hand/handle.c
+++ b/EdkModulePkg/Core/Dxe/Hand/handle.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2006, Intel Corporation                                                         \r
+Copyright (c) 2006 - 2007, Intel Corporation                                                         \r
 All rights reserved. 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
@@ -449,13 +449,13 @@ Returns:
   //\r
   // Print debug message\r
   //\r
-  DEBUG((EFI_D_ERROR | EFI_D_INFO, "InstallProtocolInterface: %g %x\n", Protocol, Interface));\r
+  DEBUG((EFI_D_ERROR | EFI_D_INFO, "InstallProtocolInterface: %g %p\n", Protocol, Interface));\r
 \r
   Status = EFI_OUT_OF_RESOURCES;\r
   Prot = NULL;\r
   Handle = NULL;\r
 \r
-  ASSERT (NULL != gBS);\r
+  ASSERT (NULL != gDxeCoreBS);\r
 \r
   if (*UserHandle != NULL_HANDLE) {\r
     Status = CoreHandleProtocol (*UserHandle, Protocol, (VOID **)&ExistingInterface);\r
@@ -978,6 +978,7 @@ Returns:
   return Status;\r
 }    \r
 \r
+STATIC\r
 PROTOCOL_INTERFACE  *\r
 CoreGetProtocolInterface (\r
   IN  EFI_HANDLE                UserHandle,\r
@@ -1325,7 +1326,7 @@ Arguments:
 \r
   UserHandle       -  The handle for the protocol interface that was previously opened\r
                       with OpenProtocol(), and is now being closed.\r
-  Protocol         -  The published unique identifier of the protocol. It is the caller¡¯s\r
+  Protocol         -  The published unique identifier of the protocol. It is the caller's\r
                       responsibility to pass in a valid GUID.\r
   AgentHandle      -  The handle of the agent that is closing the protocol interface.\r
   ControllerHandle -  If the agent that opened a protocol is a driver that follows the\r