Clean up the gBS sevice (CopyMem, SetMem, AllocatePool, FreePool) with the corresponding APIs defined in Mde library class for these modules.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2456 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 22 insertions, 26 deletions

diff --git a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c
index 34d6f266e9..7d1a3fea1d 100644
--- a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c
+++ b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.c
@@ -1333,7 +1333,7 @@ Returns:
   CopyMem (Ptr, *Buffer, OldSize);

 

   if (*Buffer != NULL) {

-    gBS->FreePool (*Buffer);

+    FreePool (*Buffer);

   }

 

   *Buffer = Ptr;

@@ -1573,7 +1573,7 @@ Returns:
     //

     // Free the old buffer

     //

-    gBS->FreePool (OldTextOutModeMap);

+    FreePool (OldTextOutModeMap);

   }

 

   return EFI_SUCCESS;

@@ -1924,8 +1924,8 @@ Returns:
     mStdErr.TextOut.SetMode (&(mStdErr.TextOut), 0);

   }

 

-  gBS->FreePool (ConOutMapTable);

-  gBS->FreePool (StdErrMapTable);

+  FreePool (ConOutMapTable);

+  FreePool (StdErrMapTable);

 

   return EFI_SUCCESS;

 }

@@ -1986,7 +1986,7 @@ Returns:
         if (ModeBuffer == NULL) {

           return EFI_OUT_OF_RESOURCES;

         }

-        gBS->FreePool (Private->GraphicsOutputModeBuffer);

+        FreePool (Private->GraphicsOutputModeBuffer);

         Private->GraphicsOutputModeBuffer = ModeBuffer;

 

         //

@@ -2001,7 +2001,7 @@ Returns:
           Mode->HorizontalResolution = Info->HorizontalResolution;

           Mode->VerticalResolution = Info->VerticalResolution;

           Mode++;

-          gBS->FreePool (Info);

+          FreePool (Info);

         }

     } else {

       //

@@ -2025,10 +2025,10 @@ Returns:
           if ((Info->HorizontalResolution == Mode->HorizontalResolution) &&

               (Info->VerticalResolution == Mode->VerticalResolution)){

             Match = TRUE;

-            gBS->FreePool (Info);

+            FreePool (Info);

             break;

           }

-          gBS->FreePool (Info);

+          FreePool (Info);

         }

 

         if (Match) {

@@ -2042,7 +2042,7 @@ Returns:
       //

       // Drop the old mode buffer, assign it to a new one

       //

-      gBS->FreePool (Private->GraphicsOutputModeBuffer);

+      FreePool (Private->GraphicsOutputModeBuffer);

       Private->GraphicsOutputModeBuffer = ModeBuffer;

 

       //

@@ -2305,7 +2305,7 @@ Returns:
     Private->TextOutQueryDataCount * sizeof (TEXT_OUT_SPLITTER_QUERY_DATA)

     );

 

-  gBS->FreePool (Private->TextOutModeMap);

+  FreePool (Private->TextOutModeMap);

   Private->TextOutModeMap = NULL;

   TextOutList             = Private->TextOutList;

 

@@ -3033,7 +3033,7 @@ ConSplitterTextOutOutputString (
   }

 

   if (BackSpaceCount) {

-    gBS->FreePool (TargetString);

+    FreePool (TargetString);

   }

 

   return ReturnStatus;

diff --git a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitterGraphics.c b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitterGraphics.c
index 9726889ec8..9faeb56d12 100644
--- a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitterGraphics.c
+++ b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitterGraphics.c
@@ -192,7 +192,6 @@ ConSpliterGraphicsOutputQueryMode (
 --*/

 {

   TEXT_OUT_SPLITTER_PRIVATE_DATA  *Private;

-  EFI_STATUS                      Status;

   TEXT_OUT_GOP_MODE               *Mode;

 

   if (This == NULL || Info == NULL || SizeOfInfo == NULL || ModeNumber >= This->Mode->MaxMode) {

@@ -208,13 +207,10 @@ ConSpliterGraphicsOutputQueryMode (
     return EFI_NOT_STARTED;

   }

 

-  Status = gBS->AllocatePool (

-                  EfiBootServicesData,

-                  sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION),

-                  (VOID **) Info

-                  );

-  if (EFI_ERROR (Status)) {

-    return Status;

+  *Info = AllocatePool (sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION));

+

+  if (*Info == NULL) {

+    return EFI_OUT_OF_RESOURCES;

   }

 

   *SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);

@@ -282,7 +278,7 @@ Routine Description:
   // Free the old version

   //

   if (Private->GraphicsOutputBlt != NULL) {

-    gBS->FreePool (Private->GraphicsOutputBlt);

+    FreePool (Private->GraphicsOutputBlt);

   }

 

   //

@@ -316,10 +312,10 @@ Routine Description:
           return Status;

         }

         if ((Info->HorizontalResolution == Mode->HorizontalResolution) && (Info->VerticalResolution == Mode->VerticalResolution)) {

-          gBS->FreePool (Info);

+          FreePool (Info);

           break;

         }

-        gBS->FreePool (Info);

+        FreePool (Info);

       }

 

       Status = GraphicsOutput->SetMode (GraphicsOutput, (UINT32) NumberIndex);

@@ -754,7 +750,7 @@ ConSpliterUgaDrawSetMode (
   //

   // Free the old version

   //

-  gBS->FreePool (Private->UgaBlt);

+  FreePool (Private->UgaBlt);

 

   //

   // Allocate the virtual Blt buffer

@@ -1319,7 +1315,7 @@ DevNullTextOutSetMode (
     Private->DevNullColumns   = Column;

     Private->DevNullRows      = Row;

 

-    gBS->FreePool (Private->DevNullScreen);

+    FreePool (Private->DevNullScreen);

 

     Size                    = (Row * (Column + 1)) * sizeof (CHAR16);

     Private->DevNullScreen  = AllocateZeroPool (Size);

@@ -1327,7 +1323,7 @@ DevNullTextOutSetMode (
       return EFI_OUT_OF_RESOURCES;

     }

 

-    gBS->FreePool (Private->DevNullAttributes);

+    FreePool (Private->DevNullAttributes);

 

     Size                        = Row * Column * sizeof (INT32);

     Private->DevNullAttributes  = AllocateZeroPool (Size);

@@ -1604,7 +1600,7 @@ DevNullSyncGopStdOut (
     }

   }

 

-  gBS->FreePool (Buffer);

+  FreePool (Buffer);

 

   return ReturnStatus;

 }