BaseTools: AutoGen - refactor out functions only called in __init__

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

diff --git a/BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py b/BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py
index 2f8f4fac23f8c59ac9b2392ac172e1d0f80ef4d9..0b4677b62a73597d7958ef09040c32b03d6bfa46 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py
+++ b/BaseTools/Source/Python/AutoGen/ValidCheckingInfoObject.py
@@ -244,16 +244,12 @@ class VAR_CHECK_PCD_VALID_OBJ(object):
         self.Type = 1\r
         self.Length = 0  # Length include this header\r
         self.VarOffset = VarOffset\r
-        self.StorageWidth = 0\r
         self.PcdDataType = PcdDataType.strip()\r
         self.rawdata = data\r
         self.data = set()\r
-        self.ValidData = True\r
-        self.updateStorageWidth()\r
-\r
-    def updateStorageWidth(self):\r
         try:\r
             self.StorageWidth = MAX_SIZE_TYPE[self.PcdDataType]\r
+            self.ValidData = True\r
         except:\r
             self.StorageWidth = 0\r
             self.ValidData = False\r
@@ -265,9 +261,6 @@ class VAR_CHECK_PCD_VALID_LIST(VAR_CHECK_PCD_VALID_OBJ):
     def __init__(self, VarOffset, validlist, PcdDataType):\r
         super(VAR_CHECK_PCD_VALID_LIST, self).__init__(VarOffset, validlist, PcdDataType)\r
         self.Type = 1\r
-        self.update_data()\r
-        self.update_size()\r
-    def update_data(self):\r
         valid_num_list = []\r
         data_list = []\r
         for item in self.rawdata:\r
@@ -283,8 +276,6 @@ class VAR_CHECK_PCD_VALID_LIST(VAR_CHECK_PCD_VALID_OBJ):
 \r
                 \r
         self.data = set(data_list)\r
-        \r
-    def update_size(self):\r
         self.Length = 5 + len(self.data) * self.StorageWidth\r
         \r
            \r
@@ -292,9 +283,6 @@ class VAR_CHECK_PCD_VALID_RANGE(VAR_CHECK_PCD_VALID_OBJ):
     def __init__(self, VarOffset, validrange, PcdDataType):\r
         super(VAR_CHECK_PCD_VALID_RANGE, self).__init__(VarOffset, validrange, PcdDataType)\r
         self.Type = 2\r
-        self.update_data()\r
-        self.update_size()\r
-    def update_data(self):\r
         RangeExpr = ""\r
         data_list = []\r
         i = 0\r
@@ -308,8 +296,6 @@ class VAR_CHECK_PCD_VALID_RANGE(VAR_CHECK_PCD_VALID_OBJ):
             for obj in rangelist.pop():\r
                 data_list.append((obj.start, obj.end))\r
         self.data = set(data_list)\r
-    \r
-    def update_size(self):\r
         self.Length = 5 + len(self.data) * 2 * self.StorageWidth\r
         \r
 \r