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

[mirror_edk2.git] / IntelFrameworkModulePkg / Universal / VariablePei / Variable.c

diff --git a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
index e050fbcf9d3f3edea3a43744ee5a813e370f0082..3751845fbf998851a8083574cc4eb6d1595e08ea 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
+++ b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.c
@@ -80,59 +80,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
 STATIC\r
 VARIABLE_HEADER *\r
 GetNextVariablePtr (\r
@@ -153,7 +100,7 @@ Returns:
 \r
 --*/\r
 {\r
-  return (VARIABLE_HEADER *) HEADER_ALIGN ((UINTN) GET_VARIABLE_DATA_PTR (Variable) + DataSizeOfVariable (Variable) + GET_PAD_SIZE (DataSizeOfVariable (Variable)));\r
+  return (VARIABLE_HEADER *) HEADER_ALIGN ((UINTN) GET_VARIABLE_DATA_PTR (Variable) + DATASIZE_OF_VARIABLE (Variable) + GET_PAD_SIZE (DATASIZE_OF_VARIABLE (Variable)));\r
 }\r
 \r
 STATIC\r
@@ -271,8 +218,8 @@ Returns:
         (((INT32 *) VendorGuid)[2] == ((INT32 *) &Variable->VendorGuid)[2]) &&\r
         (((INT32 *) VendorGuid)[3] == ((INT32 *) &Variable->VendorGuid)[3])\r
         ) {\r
-      ASSERT (NameSizeOfVariable (Variable) != 0);\r
-      if (!CompareMem (VariableName, GET_VARIABLE_NAME_PTR (Variable), NameSizeOfVariable (Variable))) {\r
+      ASSERT (NAMESIZE_OF_VARIABLE (Variable) != 0);\r
+      if (!CompareMem (VariableName, GET_VARIABLE_NAME_PTR (Variable), NAMESIZE_OF_VARIABLE (Variable))) {\r
         PtrTrack->CurrPtr = Variable;\r
         return EFI_SUCCESS;\r
       }\r
@@ -479,7 +426,7 @@ Returns:
   //\r
   // Get data size\r
   //\r
-  VarDataSize = DataSizeOfVariable (Variable.CurrPtr);\r
+  VarDataSize = DATASIZE_OF_VARIABLE (Variable.CurrPtr);\r
   if (*DataSize >= VarDataSize) {\r
     (*PeiServices)->CopyMem (Data, GET_VARIABLE_DATA_PTR (Variable.CurrPtr), VarDataSize);\r
 \r
@@ -605,9 +552,9 @@ Returns:
   while (!(Variable.CurrPtr >= Variable.EndPtr || Variable.CurrPtr == NULL)) {\r
     if (IsValidVariableHeader (Variable.CurrPtr)) {\r
       if (Variable.CurrPtr->State == VAR_ADDED) {\r
-        ASSERT (NameSizeOfVariable (Variable.CurrPtr) != 0);\r
+        ASSERT (NAMESIZE_OF_VARIABLE (Variable.CurrPtr) != 0);\r
 \r
-        VarNameSize = (UINTN) NameSizeOfVariable (Variable.CurrPtr);\r
+        VarNameSize = (UINTN) NAMESIZE_OF_VARIABLE (Variable.CurrPtr);\r
         if (VarNameSize <= *VariableNameSize) {\r
           (*PeiServices)->CopyMem (VariableName, GET_VARIABLE_NAME_PTR (Variable.CurrPtr), VarNameSize);\r
 \r