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

[mirror_edk2.git] / EdkModulePkg / Universal / Console / ConSplitter / Dxe / ConSplitterGraphics.c

diff --git a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitterGraphics.c b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitterGraphics.c
index 9726889ec843bd60ac0b514466513751bafcd94d..9faeb56d12dac8a597b411d888d99034323e16d2 100644 (file)
--- a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitterGraphics.c
+++ b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitterGraphics.c
@@ -192,7 +192,6 @@ ConSpliterGraphicsOutputQueryMode (
 --*/\r
 {\r
   TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private;\r
-  EFI_STATUS                      Status;\r
   TEXT_OUT_GOP_MODE               *Mode;\r
 \r
   if (This == NULL || Info == NULL || SizeOfInfo == NULL || ModeNumber >= This->Mode->MaxMode) {\r
@@ -208,13 +207,10 @@ ConSpliterGraphicsOutputQueryMode (
     return EFI_NOT_STARTED;\r
   }\r
 \r
-  Status = gBS->AllocatePool (\r
-                  EfiBootServicesData,\r
-                  sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION),\r
-                  (VOID **) Info\r
-                  );\r
-  if (EFI_ERROR (Status)) {\r
-    return Status;\r
+  *Info = AllocatePool (sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION));\r
+\r
+  if (*Info == NULL) {\r
+    return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
   *SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);\r
@@ -282,7 +278,7 @@ Routine Description:
   // Free the old version\r
   //\r
   if (Private->GraphicsOutputBlt != NULL) {\r
-    gBS->FreePool (Private->GraphicsOutputBlt);\r
+    FreePool (Private->GraphicsOutputBlt);\r
   }\r
 \r
   //\r
@@ -316,10 +312,10 @@ Routine Description:
           return Status;\r
         }\r
         if ((Info->HorizontalResolution == Mode->HorizontalResolution) && (Info->VerticalResolution == Mode->VerticalResolution)) {\r
-          gBS->FreePool (Info);\r
+          FreePool (Info);\r
           break;\r
         }\r
-        gBS->FreePool (Info);\r
+        FreePool (Info);\r
       }\r
 \r
       Status = GraphicsOutput->SetMode (GraphicsOutput, (UINT32) NumberIndex);\r
@@ -754,7 +750,7 @@ ConSpliterUgaDrawSetMode (
   //\r
   // Free the old version\r
   //\r
-  gBS->FreePool (Private->UgaBlt);\r
+  FreePool (Private->UgaBlt);\r
 \r
   //\r
   // Allocate the virtual Blt buffer\r
@@ -1319,7 +1315,7 @@ DevNullTextOutSetMode (
     Private->DevNullColumns   = Column;\r
     Private->DevNullRows      = Row;\r
 \r
-    gBS->FreePool (Private->DevNullScreen);\r
+    FreePool (Private->DevNullScreen);\r
 \r
     Size                    = (Row * (Column + 1)) * sizeof (CHAR16);\r
     Private->DevNullScreen  = AllocateZeroPool (Size);\r
@@ -1327,7 +1323,7 @@ DevNullTextOutSetMode (
       return EFI_OUT_OF_RESOURCES;\r
     }\r
 \r
-    gBS->FreePool (Private->DevNullAttributes);\r
+    FreePool (Private->DevNullAttributes);\r
 \r
     Size                        = Row * Column * sizeof (INT32);\r
     Private->DevNullAttributes  = AllocateZeroPool (Size);\r
@@ -1604,7 +1600,7 @@ DevNullSyncGopStdOut (
     }\r
   }\r
 \r
-  gBS->FreePool (Buffer);\r
+  FreePool (Buffer);\r
 \r
   return ReturnStatus;\r
 }\r