1) Replace MACRO with C functions.

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

diff --git a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.h b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.h
index 2f586c6f4ac99da333e57bb65d8293c4490927ca..0e37be5292bb31d9dd34c61cedb8d42759f6cafb 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/VariablePei/Variable.h
+++ b/IntelFrameworkModulePkg/Universal/VariablePei/Variable.h
@@ -44,27 +44,6 @@ Abstract:
 \r
 #define HEADER_ALIGN(Header)  (((UINTN) (Header) + HEADER_ALIGNMENT - 1) & (~(HEADER_ALIGNMENT - 1)))\r
 \r
-#define NAMESIZE_OF_VARIABLE(Variable)  \\r
-          ((((Variable)->DataSize == (UINT32) -1) || \\r
-          ((Variable)->Attributes == (UINT32) -1) || \\r
-          ((Variable)->NameSize == (UINT32) -1)) ? \\r
-          0 : \\r
-          (Variable)->NameSize \\r
-          )\r
-\r
-#define DATASIZE_OF_VARIABLE(Variable)  \\r
-          ((((Variable)->DataSize == (UINT32) -1) || \\r
-          ((Variable)->Attributes == (UINT32) -1) || \\r
-          ((Variable)->NameSize == (UINT32) -1)) ? \\r
-          0 : \\r
-          (Variable)->DataSize \\r
-          )\r
-\r
-#define GET_VARIABLE_NAME_PTR(a)  (CHAR16 *) ((UINTN) (a) + sizeof (VARIABLE_HEADER))\r
-\r
-#define GET_VARIABLE_DATA_PTR(a) \\r
-          (UINT8 *) ((UINTN) GET_VARIABLE_NAME_PTR (a) + NAMESIZE_OF_VARIABLE(a) + GET_PAD_SIZE (NAMESIZE_OF_VARIABLE(a)))\r
-\r
 typedef struct {\r
   VARIABLE_HEADER *CurrPtr;\r
   VARIABLE_HEADER *EndPtr;\r