Style refactor

* Refactored based on comments given
* Ran `ruff` for formatting
* Applied style and formatting on `dissect.executable.elf` as well (hope you don't mind)

Author: sud0woodo

dissect/executable/elf/elf.py

@@ -42,7 +42,9 @@ def __init__(self, fh: BinaryIO):
         self.header = self.c_elf.Ehdr(fh)
         self.segments = SegmentTable.from_elf(self)
         self.section_table = SectionTable.from_elf(self)
-        self.symbol_tables: list[SymbolTable] = self.section_table.by_type([SHT.SYMTAB, SHT.DYNSYM])
+        self.symbol_tables: list[SymbolTable] = self.section_table.by_type(
+            [SHT.SYMTAB, SHT.DYNSYM]
+        )
 
     def __repr__(self) -> str:
         return str(self.header)
@@ -98,7 +100,9 @@ def find(self, condition: Callable, **kwargs) -> list[T]:
 
 
 class Section:
-    def __init__(self, fh: BinaryIO, idx: Optional[int] = None, c_elf: cstruct = c_elf_64):
+    def __init__(
+        self, fh: BinaryIO, idx: Optional[int] = None, c_elf: cstruct = c_elf_64
+    ):
         self.fh = fh
         self.idx = idx
 
@@ -224,7 +228,9 @@ def dump_data(self) -> list[tuple[int, bytes]]:
 
 
 class Segment:
-    def __init__(self, fh: BinaryIO, idx: Optional[int] = None, c_elf: cstruct = c_elf_64):
+    def __init__(
+        self, fh: BinaryIO, idx: Optional[int] = None, c_elf: cstruct = c_elf_64
+    ):
         self.fh = fh
         self.idx = idx
         self.c_elf = c_elf
@@ -246,7 +252,9 @@ def __repr__(self) -> str:
         return repr(self.header)
 
     @classmethod
-    def from_segment_table(cls, table: SegmentTable, idx: Optional[int] = None) -> Segment:
+    def from_segment_table(
+        cls, table: SegmentTable, idx: Optional[int] = None
+    ) -> Segment:
         fh = table.fh
         return cls(fh, idx, table.c_elf)
 
@@ -277,7 +285,14 @@ def patch(self, new_data: bytes) -> None:
 
 
 class SegmentTable(Table[Segment]):
-    def __init__(self, fh: BinaryIO, offset: int, entries: int, size: int, c_elf: cstruct = c_elf_64):
+    def __init__(
+        self,
+        fh: BinaryIO,
+        offset: int,
+        entries: int,
+        size: int,
+        c_elf: cstruct = c_elf_64,
+    ):
         super().__init__(entries)
         self.fh = fh
         self.offset = offset
@@ -297,7 +312,9 @@ def from_elf(cls, elf: ELF) -> SegmentTable:
         offset = header.e_phoff
         entries = header.e_phnum
         size = header.e_phentsize
-        return cls(fh=elf.fh, offset=offset, entries=entries, size=size, c_elf=elf.c_elf)
+        return cls(
+            fh=elf.fh, offset=offset, entries=entries, size=size, c_elf=elf.c_elf
+        )
 
     def related_segments(self, section: Section) -> list[Segment]:
         return self.find(lambda x: x.is_related(section))
@@ -318,7 +335,9 @@ def dump_table(self) -> tuple[int, bytearray]:
 
 
 class StringTable(Section):
-    def __init__(self, fh: BinaryIO, idx: Optional[int] = None, c_elf: cstruct = c_elf_64):
+    def __init__(
+        self, fh: BinaryIO, idx: Optional[int] = None, c_elf: cstruct = c_elf_64
+    ):
         super().__init__(fh, idx, c_elf)
 
         self._get_string = lru_cache(256)(self._get_string)
@@ -333,7 +352,9 @@ def _get_string(self, index: int) -> str:
 
 
 class Symbol:
-    def __init__(self, fh: BinaryIO, idx: Optional[int] = None, c_elf: cstruct = c_elf_64):
+    def __init__(
+        self, fh: BinaryIO, idx: Optional[int] = None, c_elf: cstruct = c_elf_64
+    ):
         self.symbol = c_elf.Sym(fh)
         self.idx = idx
         self.c_elf = c_elf
@@ -388,7 +409,9 @@ def value_based_on_shndx(self, table: SectionTable) -> int:
 
 
 class SymbolTable(Section, Table[Symbol]):
-    def __init__(self, fh: BinaryIO, idx: Optional[int] = None, c_elf: cstruct = c_elf_64):
+    def __init__(
+        self, fh: BinaryIO, idx: Optional[int] = None, c_elf: cstruct = c_elf_64
+    ):
         # Initializes Section info
         Section.__init__(self, fh, idx, c_elf)
         count = self.size // self.entry_size

dissect/executable/pe/helpers/c_pe.py renamed to dissect/executable/pe/c_pe.py

@@ -1,6 +1,6 @@
 from dissect.cstruct import cstruct
 
-pe_def = """
+c_pe_def = """
 #define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16
 #define IMAGE_SIZEOF_SHORT_NAME          8
 
@@ -93,12 +93,12 @@
 };
 
 typedef struct IMAGE_FILE_HEADER {
-  MachineType  Machine;
-  WORD  NumberOfSections;
-  DWORD TimeDateStamp;
-  DWORD PointerToSymbolTable;
-  DWORD NumberOfSymbols;
-  WORD  SizeOfOptionalHeader;
+  MachineType           Machine;
+  WORD                  NumberOfSections;
+  DWORD                 TimeDateStamp;
+  DWORD                 PointerToSymbolTable;
+  DWORD                 NumberOfSymbols;
+  WORD                  SizeOfOptionalHeader;
   ImageCharacteristics  Characteristics;
 };
 
@@ -212,9 +212,9 @@
 };
 
 typedef struct IMAGE_NT_HEADERS64 {
-  DWORD                 Signature;
-  IMAGE_FILE_HEADER     FileHeader;
-  IMAGE_OPTIONAL_HEADER64 OptionalHeader;
+  DWORD                     Signature;
+  IMAGE_FILE_HEADER         FileHeader;
+  IMAGE_OPTIONAL_HEADER64   OptionalHeader;
 };
 
 flag SectionFlags : DWORD {
@@ -258,16 +258,16 @@
 };
 
 typedef struct IMAGE_SECTION_HEADER {
-    char    Name[IMAGE_SIZEOF_SHORT_NAME];
-    ULONG   VirtualSize;
-    ULONG   VirtualAddress;
-    ULONG   SizeOfRawData;
-    ULONG   PointerToRawData;
-    ULONG   PointerToRelocations;
-    ULONG   PointerToLinenumbers;
-    USHORT  NumberOfRelocations;
-    USHORT  NumberOfLinenumbers;
-    SectionFlags   Characteristics;
+    char            Name[IMAGE_SIZEOF_SHORT_NAME];
+    ULONG           VirtualSize;
+    ULONG           VirtualAddress;
+    ULONG           SizeOfRawData;
+    ULONG           PointerToRawData;
+    ULONG           PointerToRelocations;
+    ULONG           PointerToLinenumbers;
+    USHORT          NumberOfRelocations;
+    USHORT          NumberOfLinenumbers;
+    SectionFlags    Characteristics;
 };
 
 // --- END OF PE HEADERS
@@ -277,8 +277,8 @@
 typedef struct IMAGE_EXPORT_DIRECTORY {
     ULONG   Characteristics;
     ULONG   TimeDateStamp;
-    USHORT    MajorVersion;
-    USHORT    MinorVersion;
+    USHORT  MajorVersion;
+    USHORT  MinorVersion;
     ULONG   Name;
     ULONG   Base;
     ULONG   NumberOfFunctions;
@@ -441,12 +441,9 @@
 // --- END OF TLS DIRECTORY
 """
 
+c_pe = cstruct().load(c_pe_def)
 
-pestruct = cstruct()
-pestruct.load(pe_def)
-
-
-cv_info_def = """
+c_cv_info_def = """
 struct GUID {
     DWORD Data1;
     WORD Data2;
@@ -462,5 +459,4 @@
 };
 """
 
-cv_info_struct = cstruct()
-cv_info_struct.load(cv_info_def)
+c_cv_info = cstruct().load(c_cv_info_def)