code scrub on VariableRuntime Dxe driver

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

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
index 2d6d428636cc6dca510aeeb92cf658bfa599b45e..f09ed236045bab6fba52d2eaf37257be98ea4d46 100644 (file)
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
@@ -36,8 +36,14 @@ VARIABLE_CACHE_ENTRY mVariableCache[] = {
   }\r
 };\r
 \r
-GLOBAL_REMOVE_IF_UNREFERENCED VARIABLE_INFO_ENTRY *gVariableInfo = NULL;\r
+VARIABLE_INFO_ENTRY *gVariableInfo = NULL;\r
 \r
+EFI_STATUS\r
+FtwVariableSpace (\r
+  IN EFI_PHYSICAL_ADDRESS   VariableBaseAddress,\r
+  IN UINT8                  *Buffer,\r
+  IN UINTN                  BufferSize\r
+  );\r
 \r
 \r
 /**\r
@@ -747,7 +753,7 @@ Reclaim (
 \r
   @param[in] VariableName  Name of variable\r
   @param[in] VendorGuid    Guid of variable\r
-  @param[in] Attribute     Attribue of the variable\r
+  @param[in] Attributes    Attribues of the variable\r
   @param[in] DataSize      Size of data. 0 means delete\r
   @param[in] Data          Variable data\r
 \r
@@ -1364,7 +1370,7 @@ RuntimeServiceSetVariable (
     // Only variable have NV|RT attribute can be created in Runtime\r
     //\r
     if (EfiAtRuntime () &&\r
-        (!(Attributes & EFI_VARIABLE_RUNTIME_ACCESS) || !(Attributes & EFI_VARIABLE_NON_VOLATILE))) {\r
+        (((Attributes & EFI_VARIABLE_RUNTIME_ACCESS) == 0) || ((Attributes & EFI_VARIABLE_NON_VOLATILE) == 0))) {\r
       Status = EFI_INVALID_PARAMETER;\r
       goto Done;\r
     }         \r
@@ -1420,7 +1426,7 @@ RuntimeServiceSetVariable (
   // include pad size.\r
   //\r
   VarSize = VarDataOffset + DataSize + GET_PAD_SIZE (DataSize);\r
-  if (Attributes & EFI_VARIABLE_NON_VOLATILE) {\r
+  if ((Attributes & EFI_VARIABLE_NON_VOLATILE) != 0) {\r
     //\r
     // Create a nonvolatile variable\r
     //\r
@@ -1655,7 +1661,7 @@ RuntimeServiceQueryVariableInfo (
     // Make sure if runtime bit is set, boot service bit is set also.\r
     //\r
     return EFI_INVALID_PARAMETER;\r
-  } else if (EfiAtRuntime () && !(Attributes & EFI_VARIABLE_RUNTIME_ACCESS)) {\r
+  } else if (EfiAtRuntime () && ((Attributes & EFI_VARIABLE_RUNTIME_ACCESS) == 0)) {\r
     //\r
     // Make sure RT Attribute is set if we are in Runtime phase.\r
     //\r

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
index c03decedbaa0dfc1f0fde24ec2625e96f313e4ff..320d1ec562cb72a5b0e54a2730d7ec176910d5ec 100644 (file)
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
@@ -85,24 +85,4 @@ typedef struct {
   VOID        *Data;\r
 } VARIABLE_CACHE_ENTRY;\r
 \r
-\r
-//\r
-// Functions\r
-//\r
-\r
-EFI_STATUS\r
-EFIAPI\r
-VariableServiceInitialize (\r
-  IN EFI_HANDLE         ImageHandle,\r
-  IN EFI_SYSTEM_TABLE   *SystemTable\r
-  );\r
-\r
-\r
-EFI_STATUS\r
-FtwVariableSpace (\r
-  IN EFI_PHYSICAL_ADDRESS   VariableBaseAddress,\r
-  IN UINT8                  *Buffer,\r
-  IN UINTN                  BufferSize\r
-  );\r
-\r
 #endif\r