1. Use MemoryAllocationLib to replace boot services memory services functions in...

[mirror_edk2.git] / EdkModulePkg / Universal / UserInterface / SetupBrowser / Dxe / ProcessOptions.c

diff --git a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/ProcessOptions.c b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/ProcessOptions.c
index 2484f5089c321784aa9660587f34995d08cf110c..a2dc8083460a2b6ef6521608aaeddf7fe8be1948 100644 (file)
--- a/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/ProcessOptions.c
+++ b/EdkModulePkg/Universal/UserInterface/SetupBrowser/Dxe/ProcessOptions.c
@@ -138,7 +138,7 @@ AdjustNvMap (
     }\r
   }\r
 \r
-  gBS->FreePool (VariableDefinition->NvRamMap);\r
+  FreePool (VariableDefinition->NvRamMap);\r
   VariableDefinition->NvRamMap          = NvRamMap;\r
   VariableDefinition->VariableFakeSize  = (UINT16) SizeRequired;\r
 }\r
@@ -226,7 +226,7 @@ ProcessOptions (
                   );\r
 \r
   if (*OptionString != NULL) {\r
-    gBS->FreePool (*OptionString);\r
+    FreePool (*OptionString);\r
     *OptionString = NULL;\r
   }\r
 \r
@@ -311,7 +311,7 @@ ProcessOptions (
       if (!EFI_ERROR (Status)) {\r
         if (Tag->Operand == EFI_IFR_ORDERED_LIST_OP) {\r
           CopyMem (NvRamMap, ValueArray, MenuOption->ThisTag->StorageWidth);\r
-          gBS->FreePool (ValueArray);\r
+          FreePool (ValueArray);\r
         } else {\r
           //\r
           // Since the value can be one byte long or two bytes long, do a CopyMem based on StorageWidth\r
@@ -359,7 +359,7 @@ ProcessOptions (
                 // Since the value can be one byte long or two bytes long, do a CopyMem based on StorageWidth\r
                 //\r
                 CopyMem (NvRamMap, &Number, MenuOption->ThisTag->StorageWidth);\r
-                gBS->FreePool (StringPtr);\r
+                FreePool (StringPtr);\r
                 break;\r
 \r
               default:\r
@@ -372,7 +372,7 @@ ProcessOptions (
         UpdateStatusBar (NV_UPDATE_REQUIRED, Tag->Flags, TRUE);\r
       } else {\r
         if (Tag->Operand == EFI_IFR_ORDERED_LIST_OP) {\r
-          gBS->FreePool (ValueArray);\r
+          FreePool (ValueArray);\r
         }\r
 \r
         return EFI_SUCCESS;\r
@@ -434,7 +434,7 @@ ProcessOptions (
             //\r
             // Remove Buffer allocated for StringPtr after it has been used.\r
             //\r
-            gBS->FreePool (StringPtr);\r
+            FreePool (StringPtr);\r
           } else {\r
             //\r
             // The option value is the same as what is stored in NV store.  Print this.\r
@@ -447,7 +447,7 @@ ProcessOptions (
               //\r
               // Remove Buffer allocated for StringPtr after it has been used.\r
               //\r
-              gBS->FreePool (StringPtr);\r
+              FreePool (StringPtr);\r
               Default = 0;\r
               break;\r
             }\r
@@ -475,7 +475,7 @@ ProcessOptions (
         //\r
         // Remove Buffer allocated for StringPtr after it has been used.\r
         //\r
-        gBS->FreePool (StringPtr);\r
+        FreePool (StringPtr);\r
       }\r
     }\r
     break;\r
@@ -1028,7 +1028,7 @@ ProcessOptions (
         UpdateStatusBar (NV_UPDATE_REQUIRED, Tag->Flags, TRUE);\r
       }\r
 \r
-      gBS->FreePool (StringPtr);\r
+      FreePool (StringPtr);\r
       return Status;\r
     } else {\r
       for (Index = 0; Index < gOptionBlockWidth; Index++) {\r
@@ -1073,13 +1073,13 @@ ProcessOptions (
 \r
         if (EFI_ERROR (Status)) {\r
           if (Status == EFI_NOT_READY) {\r
-            gBS->FreePool (StringPtr);\r
+            FreePool (StringPtr);\r
             return EFI_SUCCESS;\r
           }\r
         }\r
 \r
         Status = ReadPassword (MenuOption, TRUE, Tag, PageData, TRUE, FileFormTags, StringPtr);\r
-        gBS->FreePool (StringPtr);\r
+        FreePool (StringPtr);\r
         return EFI_SUCCESS;\r
       }\r
 \r
@@ -1090,7 +1090,7 @@ ProcessOptions (
           //\r
           Status = ReadPassword (MenuOption, TRUE, Tag, PageData, FALSE, FileFormTags, StringPtr);\r
           if (EFI_ERROR (Status)) {\r
-            gBS->FreePool (StringPtr);\r
+            FreePool (StringPtr);\r
             return EFI_SUCCESS;\r
           }\r
 \r
@@ -1102,7 +1102,7 @@ ProcessOptions (
           }\r
 \r
           if (Status != 0) {\r
-            gBS->FreePool (StringPtr);\r
+            FreePool (StringPtr);\r
             return EFI_SUCCESS;\r
           } else {\r
             break;\r
@@ -1123,7 +1123,7 @@ ProcessOptions (
         //\r
         // User couldn't figure out how to type two identical passwords\r
         //\r
-        gBS->FreePool (StringPtr);\r
+        FreePool (StringPtr);\r
         return EFI_SUCCESS;\r
       }\r
       //\r
@@ -1180,8 +1180,8 @@ ProcessOptions (
                         );\r
       }\r
 \r
-      gBS->FreePool (TmpNvRamMap);\r
-      gBS->FreePool (StringPtr);\r
+      FreePool (TmpNvRamMap);\r
+      FreePool (StringPtr);\r
       break;\r
     }\r
 \r