BaseTools: create and use a standard shared variable for '*'

add a variable for the string '*' and then use it instead of lots of '*'

Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by : Bob Feng <bob.c.feng@intel.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/BaseTools/Source/Python/Common/VpdInfoFile.py b/BaseTools/Source/Python/Common/VpdInfoFile.py
index 2fb8e66fe9..3be0670e36 100644
--- a/BaseTools/Source/Python/Common/VpdInfoFile.py
+++ b/BaseTools/Source/Python/Common/VpdInfoFile.py
@@ -57,7 +57,7 @@ FILE_COMMENT_TEMPLATE = \
 #  <PcdName>         ::=  <TokenSpaceCName> "." <PcdCName>

 #  <TokenSpaceCName> ::=  C Variable Name of the Token Space GUID

 #  <PcdCName>        ::=  C Variable Name of the PCD

-#  <Offset>          ::=  {"*"} {<HexNumber>}

+#  <Offset>          ::=  {TAB_STAR} {<HexNumber>}

 #  <HexNumber>       ::=  "0x" (a-fA-F0-9){1,8}

 #  <Size>            ::=  <HexNumber>

 #  <Value>           ::=  {<HexNumber>} {<NonNegativeInt>} {<QString>} {<Array>}

@@ -92,7 +92,7 @@ class VpdInfoFile:
         if (Vpd is None):

             EdkLogger.error("VpdInfoFile", BuildToolError.ATTRIBUTE_UNKNOWN_ERROR, "Invalid VPD PCD entry.")

 

-        if not (Offset >= 0 or Offset == "*"):

+        if not (Offset >= 0 or Offset == TAB_STAR):

             EdkLogger.error("VpdInfoFile", BuildToolError.PARAMETER_INVALID, "Invalid offset parameter: %s." % Offset)

 

         if Vpd.DatumType == TAB_VOID:

@@ -186,8 +186,8 @@ class VpdInfoFile:
                         VpdObjectTokenCName = PcdItem[0]

                 for sku in VpdObject.SkuInfoList:

                     if VpdObject.TokenSpaceGuidCName == TokenSpaceName and VpdObjectTokenCName == PcdTokenName.strip() and sku == SkuId:

-                        if self._VpdArray[VpdObject][sku] == "*":

-                            if Offset == "*":

+                        if self._VpdArray[VpdObject][sku] == TAB_STAR:

+                            if Offset == TAB_STAR:

                                 EdkLogger.error("BPDG", BuildToolError.FORMAT_INVALID, "The offset of %s has not been fixed up by third-party BPDG tool." % PcdName)

                             self._VpdArray[VpdObject][sku] = Offset

                         Found = True