a bit of cleanup

trolldbois · Aug 14, 2017 · eee07f4 · eee07f4
1 parent 2205fc6
commit eee07f4
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 369 deletions.
diff --git a/haystack/reverse/api.py b/haystack/reverse/api.py
@@ -45,7 +45,7 @@ def reverse_heap(memory_handler, heap_addr):
         doublelink.rename_all_lists()
 
         # save to file
-        file_writer = model.WriteRecordToFile(memory_handler)
+        file_writer = model.WriteRecordToFile(memory_handler, 'reversed.py')
         file_writer.reverse_context(heap_context)
 
         # etc

diff --git a/haystack/reverse/context.py b/haystack/reverse/context.py
@@ -188,7 +188,6 @@ def __init__(self, memory_handler, walker):
         self._heap_start = walker.get_heap_address()
         self._function_names = dict()
         # refresh heap pointers list and allocators chunks
-        self._reversedTypes = dict()
         self._structures = None
         self._init2()
         return

diff --git a/haystack/reverse/fieldtypes.py b/haystack/reverse/fieldtypes.py
@@ -431,5 +431,5 @@ def __init__(self, field_name, offset, field_type_name, fields):
 
     def to_string(self):
         comment = '# field struct %s' % self.type_name
-        fstr = "( '%s' , %s ), %s\n" % (self.name, self.get_typename(), comment)
+        fstr = "( '%s' , %s ), %s\n" % (self.name, self.type_name, comment)
         return fstr
diff --git a/haystack/reverse/heuristics/model.py b/haystack/reverse/heuristics/model.py
@@ -172,7 +172,7 @@ def reverse_record(self, _context, _record):
         _record.saveme(_context)
 
     def _write(self):
-        self._fout.write('\n'.join(self._towrite))
+        self._fout.write(b'\n'.join(self._towrite))
         self._fout.flush()
         self._towrite = []
         pass