MdeModulePkg/Library: Fix typos in comments and variables

[mirror_edk2.git] / MdeModulePkg / Library / PlatformVarCleanupLib / PlatVarCleanupLib.c

diff --git a/MdeModulePkg/Library/PlatformVarCleanupLib/PlatVarCleanupLib.c b/MdeModulePkg/Library/PlatformVarCleanupLib/PlatVarCleanupLib.c
index d99174c4b962126e95ece2bd4d836c5aa9c3620c..b96f8ddd831f7254188e2b03a3e4323ef90959f7 100644 (file)
--- a/MdeModulePkg/Library/PlatformVarCleanupLib/PlatVarCleanupLib.c
+++ b/MdeModulePkg/Library/PlatformVarCleanupLib/PlatVarCleanupLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   Sample platform variable cleanup library implementation.\r
 \r
-Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>\r
 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
@@ -100,6 +100,15 @@ IsUserVariable (
   EFI_STATUS                    Status;\r
   VAR_CHECK_VARIABLE_PROPERTY   Property;\r
 \r
+  if (mVarCheck == NULL) {\r
+    gBS->LocateProtocol (\r
+           &gEdkiiVarCheckProtocolGuid,\r
+           NULL,\r
+           (VOID **) &mVarCheck\r
+           );\r
+  }\r
+  ASSERT (mVarCheck != NULL);\r
+\r
   ZeroMem (&Property, sizeof (Property));\r
   Status = mVarCheck->VariablePropertyGet (\r
                         Name,\r
@@ -917,7 +926,7 @@ VariableCleanupHiiCallback (
   }\r
 \r
   //\r
-  // Retrive uncommitted data from Form Browser.\r
+  // Retrieve uncommitted data from Form Browser.\r
   //\r
   VariableCleanupData = &Private->VariableCleanupData;\r
   HiiGetBrowserData (&mVariableCleanupHiiGuid, mVarStoreName, sizeof (VARIABLE_CLEANUP_DATA), (UINT8 *) VariableCleanupData);\r
@@ -1225,13 +1234,6 @@ PlatformVarCleanupLibConstructor (
   mLastVarErrorFlag = InternalGetVarErrorFlag ();\r
   DEBUG ((EFI_D_INFO, "mLastVarErrorFlag - 0x%02x\n", mLastVarErrorFlag));\r
 \r
-  Status = gBS->LocateProtocol (\r
-                  &gEdkiiVarCheckProtocolGuid,\r
-                  NULL,\r
-                  (VOID **) &mVarCheck\r
-                  );\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
   //\r
   // Register EFI_END_OF_DXE_EVENT_GROUP_GUID event.\r
   //\r