Clean up the gBS sevice (CopyMem, SetMem, AllocatePool, FreePool) with the correspond...

[mirror_edk2.git] / EdkModulePkg / Universal / Console / Terminal / Dxe / Terminal.c

diff --git a/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.c b/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.c
index 6aa70e4c9562f4e30d26b0ef42a23ed68a2179b4..ba113c27ad4919a8e77e22b5a8d4686743475f70 100644 (file)
--- a/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.c
+++ b/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.c
@@ -275,7 +275,7 @@ TerminalDriverBindingStart (
       }\r
     }\r
 \r
-    gBS->FreePool (OpenInfoBuffer);\r
+    FreePool (OpenInfoBuffer);\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
@@ -566,7 +566,7 @@ TerminalDriverBindingStart (
   }\r
 \r
   if (DefaultNode != NULL) {\r
-    gBS->FreePool (DefaultNode);\r
+    FreePool (DefaultNode);\r
   }\r
   \r
   return EFI_SUCCESS;\r
@@ -604,15 +604,15 @@ Error:
       }\r
 \r
       if (TerminalDevice->DevicePath != NULL) {\r
-        gBS->FreePool (TerminalDevice->DevicePath);\r
+        FreePool (TerminalDevice->DevicePath);\r
       }\r
 \r
-      gBS->FreePool (TerminalDevice);\r
+      FreePool (TerminalDevice);\r
     }\r
   }\r
 \r
   if (DefaultNode != NULL) {\r
-    gBS->FreePool (DefaultNode);\r
+    FreePool (DefaultNode);\r
   }\r
   \r
   This->Stop (This, Controller, 0, NULL);\r
@@ -713,7 +713,7 @@ TerminalDriverBindingStop (
       // Free the ParentDevicePath that was duplicated in Start()\r
       //\r
       if (!EFI_ERROR (Status)) {\r
-        gBS->FreePool (ParentDevicePath);\r
+        FreePool (ParentDevicePath);\r
       }\r
     }\r
 \r
@@ -803,8 +803,8 @@ TerminalDriverBindingStop (
 \r
         gBS->CloseEvent (TerminalDevice->TwoSecondTimeOut);\r
         gBS->CloseEvent (TerminalDevice->SimpleInput.WaitForKey);\r
-        gBS->FreePool (TerminalDevice->DevicePath);\r
-        gBS->FreePool (TerminalDevice);\r
+        FreePool (TerminalDevice->DevicePath);\r
+        FreePool (TerminalDevice);\r
       }\r
     }\r
 \r
@@ -850,11 +850,11 @@ TerminalUpdateConsoleDevVariable (
     SetTerminalDevicePath (TerminalType, ParentDevicePath, &TempDevicePath);\r
     NewVariable = AppendDevicePathInstance (Variable, TempDevicePath);\r
     if (Variable != NULL) {\r
-      gBS->FreePool (Variable);\r
+      FreePool (Variable);\r
     }\r
 \r
     if (TempDevicePath != NULL) {\r
-      gBS->FreePool (TempDevicePath);\r
+      FreePool (TempDevicePath);\r
     }\r
 \r
     Variable = NewVariable;\r
@@ -870,7 +870,7 @@ TerminalUpdateConsoleDevVariable (
                   Variable\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
-  gBS->FreePool (Variable);\r
+  FreePool (Variable);\r
 \r
   return ;\r
 }\r
@@ -932,7 +932,7 @@ TerminalRemoveConsoleDevVariable (
   //\r
   Instance = GetNextDevicePathInstance (&Variable, &InstanceSize);\r
   if (Instance == NULL) {\r
-    gBS->FreePool (OriginalVariable);\r
+    FreePool (OriginalVariable);\r
     return ;\r
   }\r
   //\r
@@ -956,7 +956,7 @@ TerminalRemoveConsoleDevVariable (
           FoundOne  = TRUE;\r
         }\r
 \r
-        gBS->FreePool (TempDevicePath);\r
+        FreePool (TempDevicePath);\r
       }\r
     }\r
     //\r
@@ -966,17 +966,17 @@ TerminalRemoveConsoleDevVariable (
       SavedNewVariable  = NewVariable;\r
       NewVariable       = AppendDevicePathInstance (NewVariable, Instance);\r
       if (SavedNewVariable != NULL) {\r
-        gBS->FreePool (SavedNewVariable);\r
+        FreePool (SavedNewVariable);\r
       }\r
     }\r
     //\r
     // Get next device path instance from Variable\r
     //\r
-    gBS->FreePool (Instance);\r
+    FreePool (Instance);\r
     Instance = GetNextDevicePathInstance (&Variable, &InstanceSize);\r
   } while (Instance != NULL);\r
 \r
-  gBS->FreePool (OriginalVariable);\r
+  FreePool (OriginalVariable);\r
 \r
   if (FoundOne) {\r
     VariableSize = GetDevicePathSize (NewVariable);\r
@@ -992,7 +992,7 @@ TerminalRemoveConsoleDevVariable (
   }\r
 \r
   if (NewVariable != NULL) {\r
-    gBS->FreePool (NewVariable);\r
+    FreePool (NewVariable);\r
   }\r
 \r
   return ;\r
@@ -1051,7 +1051,7 @@ Returns:
     //\r
     // Allocate the buffer to return\r
     //\r
-    gBS->FreePool (Buffer);\r
+    FreePool (Buffer);\r
     Buffer = AllocatePool (BufferSize);\r
     if (Buffer == NULL) {\r
       *VariableSize = 0;\r
@@ -1063,7 +1063,7 @@ Returns:
     Status = gRT->GetVariable (Name, VendorGuid, NULL, &BufferSize, Buffer);\r
     if (EFI_ERROR (Status)) {\r
       BufferSize = 0;\r
-      gBS->FreePool (Buffer);\r
+      FreePool (Buffer);\r
       Buffer = NULL;\r
     }\r
   } else {\r
@@ -1071,7 +1071,7 @@ Returns:
     // Variable not found or other errors met.\r
     //\r
     BufferSize = 0;\r
-    gBS->FreePool (Buffer);\r
+    FreePool (Buffer);\r
     Buffer = NULL;\r
   }\r
 \r