Simplified the Type class. Removed padding previously introduced for writing LDT items.

David Boddie committed 9 years ago

Commit 5b67b841 parent 6526ce11 file · +4 −10Browse files

Unified · Split

 class Type:
-    def __init__(self, desc_number = 0, size = 0, number_ptrs = 0, array = ""):
+    def __init__(self, desc_number = 0, size = 0, array = ""):
         self.desc_number = desc_number
         self.size = size
-        self.number_ptrs = number_ptrs
         self.array = array
     def read(self, f):
         self.desc_number = read_OP(f)
         self.size = read_OP(f)
-        self.number_ptrs = read_OP(f)
+        number_ptrs = read_OP(f)
-        self.array = f.read(self.number_ptrs)
+        self.array = f.read(number_ptrs)
         return self
         write_OP(f, self.desc_number)
         write_OP(f, self.size)
-        write_OP(f, self.number_ptrs)
+        write_OP(f, len(self.array))
         f.write(self.array)
         _write(f, ">I", self.sig)
         write_C(f, self.name)
-        # Pad to a word boundary if necessary.
-        remainder = len(self.name) % 4
-        if remainder != 0:
-            f.write("\x00" * (4 - remainder))
 class ExceptionInfo: