Change C functions, xxxSizeOfVariable(), to MACRO, which can avoid the ICC compile...

[mirror_edk2.git] / MdeModulePkg / Universal / Variable / RuntimeDxe / Variable.c

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
index e1fec9d62c6e31a3828ddc9bd68ca29e99dcfa8f..d7cb0cd71c1908c79f726b3732c4918a0b98c9cd 100644 (file)
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
@@ -367,60 +367,6 @@ Returns:
   }\r
 }\r
 \r
-\r
-UINT32\r
-NameSizeOfVariable (\r
-  IN  VARIABLE_HEADER   *Variable\r
-  )\r
-{\r
-  //\r
-  // Check whether the header is valid fully;\r
-  // Tricky: The unprogramed data in FLASH equals 0xff.\r
-  // \r
-  if (Variable->DataSize == (UINT32) -1 || \r
-      Variable->Attributes == (UINT32) -1 || \r
-      Variable->NameSize == (UINT32) -1) {\r
-    return 0;\r
-  }\r
-  return Variable->NameSize;\r
-}\r
-\r
-UINT32\r
-DataSizeOfVariable (\r
-  IN  VARIABLE_HEADER   *Variable\r
-  )\r
-{\r
-  //\r
-  // Check whether the header is valid fully;\r
-  // Tricky: The unprogramed data in FLASH equals 0xff.\r
-  // \r
-  if (Variable->DataSize == (UINT32) -1 || \r
-      Variable->Attributes == (UINT32) -1 || \r
-      Variable->NameSize == (UINT32) -1) {\r
-    return 0;\r
-  }\r
-  return Variable->DataSize;\r
-}\r
-\r
-UINT32\r
-AttributesOfVariable (\r
-  IN  VARIABLE_HEADER   *Variable\r
-  )\r
-{\r
-\r
-  //\r
-  // Check whether the header is valid fully;\r
-  // Tricky: The unprogramed data in FLASH equals 0xff.\r
-  // \r
-  if (Variable->DataSize == (UINT32) -1 || \r
-      Variable->Attributes == (UINT32) -1 || \r
-      Variable->NameSize == (UINT32) -1) {\r
-    return 0;\r
-  }\r
-  return Variable->Attributes;\r
-}\r
-\r
-\r
 UINT8 *\r
 GetVariableDataPtr (\r
   IN  VARIABLE_HEADER   *Variable\r
@@ -444,7 +390,7 @@ Returns:
   //\r
   // Be careful about pad size for alignment\r
   //\r
-  return (UINT8 *) ((UINTN) GET_VARIABLE_NAME_PTR (Variable) + NameSizeOfVariable (Variable) + GET_PAD_SIZE (NameSizeOfVariable (Variable)));\r
+  return (UINT8 *) ((UINTN) GET_VARIABLE_NAME_PTR (Variable) + NAMESIZE_OF_VARIABLE (Variable) + GET_PAD_SIZE (NAMESIZE_OF_VARIABLE (Variable)));\r
 }\r
 \r
 \r
@@ -474,7 +420,7 @@ Returns:
   //\r
   // Be careful about pad size for alignment\r
   //\r
-  return (VARIABLE_HEADER *) HEADER_ALIGN (((UINTN) GetVariableDataPtr (Variable) + DataSizeOfVariable (Variable) + GET_PAD_SIZE (DataSizeOfVariable (Variable))));\r
+  return (VARIABLE_HEADER *) HEADER_ALIGN (((UINTN) GetVariableDataPtr (Variable) + DATASIZE_OF_VARIABLE (Variable) + GET_PAD_SIZE (DATASIZE_OF_VARIABLE (Variable))));\r
 }\r
 \r
 VARIABLE_HEADER *\r
@@ -836,8 +782,8 @@ Returns:
             return EFI_SUCCESS;\r
           } else {\r
             if (CompareGuid (VendorGuid, &Variable[Index]->VendorGuid)) {\r
-              ASSERT (NameSizeOfVariable (Variable[Index]) != 0);\r
-              if (!CompareMem (VariableName, GET_VARIABLE_NAME_PTR (Variable[Index]), NameSizeOfVariable (Variable[Index]))) {\r
+              ASSERT (NAMESIZE_OF_VARIABLE (Variable[Index]) != 0);\r
+              if (!CompareMem (VariableName, GET_VARIABLE_NAME_PTR (Variable[Index]), NAMESIZE_OF_VARIABLE (Variable[Index]))) {\r
                 PtrTrack->CurrPtr   = Variable[Index];\r
                 PtrTrack->Volatile  = (BOOLEAN)(Index == 0);\r
                 return EFI_SUCCESS;\r
@@ -920,7 +866,7 @@ RuntimeServiceGetVariable (
   //\r
   // Get data size\r
   //\r
-  VarDataSize = DataSizeOfVariable (Variable.CurrPtr);\r
+  VarDataSize = DATASIZE_OF_VARIABLE (Variable.CurrPtr);\r
   ASSERT (VarDataSize != 0);\r
 \r
   if (*DataSize >= VarDataSize) {\r
@@ -1027,7 +973,7 @@ RuntimeServiceGetNextVariableName (
     //\r
     if (IsValidVariableHeader (Variable.CurrPtr) && Variable.CurrPtr->State == VAR_ADDED) {\r
       if (!(EfiAtRuntime () && !(Variable.CurrPtr->Attributes & EFI_VARIABLE_RUNTIME_ACCESS))) {\r
-        VarNameSize = NameSizeOfVariable (Variable.CurrPtr);\r
+        VarNameSize = NAMESIZE_OF_VARIABLE (Variable.CurrPtr);\r
         ASSERT (VarNameSize != 0);\r
 \r
         if (VarNameSize <= *VariableNameSize) {\r
@@ -1228,7 +1174,7 @@ RuntimeServiceSetVariable (
     // If the variable is marked valid and the same data has been passed in\r
     // then return to the caller immediately.\r
     //\r
-    if (DataSizeOfVariable (Variable.CurrPtr) == DataSize &&\r
+    if (DATASIZE_OF_VARIABLE (Variable.CurrPtr) == DataSize &&\r
         (CompareMem (Data, GetVariableDataPtr (Variable.CurrPtr), DataSize) == 0)) {\r
       \r
       UpdateVariableInfo (VariableName, VendorGuid, Volatile, FALSE, TRUE, FALSE, FALSE);\r