1) Replace MACRO with C functions.

2) Add HEADER_VALID_ONLY state of variable, which represents only the header is valid and the data/name is stale. This may be caused by incomplete data updating. Adding the state helps to check whether the header is valid. If variable header is valid, then we must skip the data of variable with the valid size. If the header is invalid, we should only skip the header of variable. 

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

1 files changed, 0 insertions, 18 deletions

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
index 09a184d478..f8a4e058f5 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
@@ -59,24 +59,6 @@ Abstract:
 

 #define HEADER_ALIGN(Header)  (((UINTN) (Header) + HEADER_ALIGNMENT - 1) & (~(HEADER_ALIGNMENT - 1)))

 

-#define NAMESIZE_OF_VARIABLE(Variable)  \

-          ((((Variable)->DataSize == (UINT32) -1) || \

-          ((Variable)->Attributes == (UINT32) -1) || \

-          ((Variable)->NameSize == (UINT32) -1)) ? \

-          0 : \

-          (Variable)->NameSize \

-          )

-

-#define DATASIZE_OF_VARIABLE(Variable)  \

-          ((((Variable)->DataSize == (UINT32) -1) || \

-          ((Variable)->Attributes == (UINT32) -1) || \

-          ((Variable)->NameSize == (UINT32) -1)) ? \

-          0 : \

-          (Variable)->DataSize \

-          )

-

-#define GET_VARIABLE_NAME_PTR(a)  (CHAR16 *) ((UINTN) (a) + sizeof (VARIABLE_HEADER))

-

 

 typedef struct {

   VARIABLE_HEADER *CurrPtr;